Fixes to the map