Fixed user location issues