- Map issues fixed