Cleanup and bugfix on IncomingInvoice