Corrected build scripts