fix more lint issues