Map fixes

Changes:
1) Map fixes.