Try to fix the map some more