upgrader/upgrades fixes