Small changes before GeoCoder