Fix regressions from cc69874