Further improvements to the build.