configuration class fixes