Fixes for invoices