Initial fix for the geolocation issues.