fix more analyzers