fix more coverity defects