fix more tracking bugs