Fixes for configuration.