Trying once more to fix submodule paths