map fixes
Merge pull request #182 from alex-gh/map_fixes

map fixes