Some minor additional classes.