Some modifications to the build script