Some minor improvements to the build script