Small fixes for the map