Fix regressions after replifactor.