Fixes for tracker_checking