TrackingPosition fixes