Misleading pricing during upgrades

Other iD issues: