Small changes to MapFragment