More, hopefully final tweaks for the build process.