Fixes after integration of geolocation strategy