Fix DirectTrack issues