Submodule issues resolved for now.