Minor fixes in maps