Fix missing keys in custom_settings