Fixed up location tracking.