Minor tweaks for the build process.