Fixing submodule issues