Fixed MapViewController bugs