Had minor bug with deserializing maps: a few maps used incorrect atomic wrappers for their fields.  Should be fixed.