Fix more failures