silly class fixes