More location improvements