Some fixes to maps