Minor class changes.