Map fixes
Everybody merge now