Fixes for the map