more class fixup