More tweaks to build.