GeoFencing tweaks