Fixed more class errors