Fixed some other classes