Fixes to Geocoder