Fixed class minor class issues