Fix more regressions