Bug fixes in servelt for invoices