Small changes to lots of different classes.