minor tweaks to upgrade