Various fixes especially on the track recorder