More tweaking for GPS location