map, xml fixes