More tweaks for invoicing