Fix regressions