pre-class fixes