Fixed submodule issues (hopefully)