Fixes to configuration classes and the configurations.