Fix discounts with upgrades