Fixes of VAT stuff