Fix more classes