Fix for configuration defaults