CTCReader & Tracking Network fixes