Geolocator enhancements