Fix submodule handling