Minor changes to some of the classes.