More changes to build script