Fixed submodules issues