Fixed a couple submodule issues