fix more of the submodules