Some geolocation fixes