Cleanup, fix possible bug with waiting for track.