Fix enqueue and dequeue of tracks