Some minor changes to build script