Many fixes in invoices