Small changes to build script