Fixes and modifications to GoogleMapFragment