Fixed submodule issues (hopefully for good)