Small tweaks to build script.