Fixing VAT issues