fix up of related classes.