Small changes to a few classes.