Small Bug Fixes to classes that manage the Map.