More tweaks for the final build process.