Minor updates for invoicing