Sampletrack - fix remaining timing issues