fix more minor issues