Location detection tweaks