[geolocation] Fixes for Bugs 1022630, 1027489, and 1022637

Good point, didn't think of going in the other direction.