Fix more regressions.