Fix some geolocation bugs