Minor tweaks to the build scripts.