class fixes