Minor class changes