location service bug fixes