Various improvements to the TrackerManager