Handle VAT in upgrade

Oh god, kill me.