Seems Map serialization and others were not as well tested as I thought. I spent most of my time serializing objects not maps. This needs more unit testing.