More fixes to metadata writers, which had slipped through some cracks.
Merge pull request #127 from acidmoose/master

Missing changes from Replay commit