Fixes on invoices