Fixed more class displays