Some modifications to build script