Map fixes
Merging