More fixes for location.