Minor changes to subclasses.