"more class fixes"