More tweaks to the build file.