Some fixes and changes in maps.