Fixes to Map.