Fix issues with classes.