Bugs fixed in build page