Typescript fixes and invoice commodity vat fix