Final tweaks to the upgrade