Improvements to the builder upgrade.