Fix geocoder problems