Improve TrackerChecking

Make TrackerChecking less aggressive.