Fixing up maps