Fix submodule issues (1/2)