Fixing up submodules