More location tweaks