Small fixes
Map fixes