Geolocation fixes