fix more uninit errors