Fixing Submodule Issues