A bunch of Geolocation fixes.
Merge pull request #966 from glogiotatidis/location-fixes

A bunch of Geolocation fixes.