Class fix up