Small fixes to support loading of map records.