Some more location behavior enhancements