A few small changes to some classes.