invoice id fixes