Some fixes to maps.