Minor improvements to build script