A few updates to classes.