Better handling of configuration defaults for the new settings