Fix track stuff