Fix conservative upgrades.