Various fixes to submodules.