Adapted some missing submodules.