Fixes for compatibility with the EU VAT validation service