Some fixes and additions in maps