diff --git a/driver.c b/driver.c
index c0d564696a..4cbc53fd18 100644
--- a/driver.c
+++ b/driver.c
@@ -219,7 +219,7 @@ const char* config_get_input_driver_options(void)
       input_options[offset] = '|';
       offset += 1;
    }
-   input_options[input_options_len] = '\0';
+   input_options[input_options_len - 1] = '\0';
 
    return input_options;
 }
diff --git a/settings_data.c b/settings_data.c
index 09ca242c4d..eb42ed7826 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -989,9 +989,7 @@ rarch_setting_t setting_data_action_setting(const char* name,
       const char* short_description,
       const char *group, const char *subgroup)
 {
-   rarch_setting_t result;
-   result.type                  = ST_ACTION;
-   result.name                  = name;
+   rarch_setting_t result = { ST_ACTION, name };
    result.short_description     = short_description;
    result.group                 = group;
    result.subgroup              = subgroup;