Fix more CI failures.