Minor fixes to GeocodingHelper