Minor changes to multiple classes.