Fix a few lesser issues found while debugging
Merge branch 'their/producer-ng' into feature/writer-ng