Location services fixes