Pre-class fixes