fix more tracking errors