Location tweaks