some fixes on the geolocation part