Map fixes
Merge pull request #29 from alex-gh/map_fixes2

Map fixes