Some user location improvements