Fix more undefined classes.