Fix more cases