More tweaks for the build