Fixed submodule issues