Invoice fixes [MS-621]

All tests pass.