More tweaks to the upgrade guide.