Resolved submodules issues