Fix regressions.