Repair build process and last few builds