Fix regressions from previous commits