Fixed up some classes.