Fixing broken submodules again