Fixes to geocoder