diff --git a/database_info.c b/database_info.c
index b0c3816460..2dfeaeedec 100644
--- a/database_info.c
+++ b/database_info.c
@@ -45,10 +45,10 @@ int database_open_cursor(libretrodb_t *db,
 
 database_info_list_t *database_info_list_new(const char *rdb_path, const char *query)
 {
-   size_t i = 0, j;
    libretrodb_t db;
    libretrodb_cursor_t cur;
    struct rmsgpack_dom_value item;
+   size_t i = 0, j;
    database_info_t *database_info = NULL;
    database_info_list_t *database_info_list = NULL;
 
diff --git a/settings_data.c b/settings_data.c
index 5d9343d98f..2cf235c6d5 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -3027,8 +3027,6 @@ void setting_data_get_label(void *data, char *type_str,
       menu_common_setting_set_label_perf(type_str, type_str_size, w, type,
             perf_counters_libretro,
             type - MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN);
-   else if (setting)
-      setting_data_get_string_representation(setting, type_str, type_str_size);
    else
    {
       if (!driver.menu || !driver.menu->menu_list)
@@ -3039,19 +3037,19 @@ void setting_data_get_label(void *data, char *type_str,
       setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
             driver.menu->menu_list->selection_buf->list[idx].label);
 
-      if (setting)
+      if (!setting)
+         return;
+
+      if (!strcmp(setting->name, "configurations"))
       {
-         if (!strcmp(setting->name, "configurations"))
-         {
-            if (*g_extern.config_path)
-               fill_pathname_base(type_str, g_extern.config_path,
-                     type_str_size);
-            else
-               strlcpy(type_str, "<default>", type_str_size);
-         }
+         if (*g_extern.config_path)
+            fill_pathname_base(type_str, g_extern.config_path,
+                  type_str_size);
          else
-            setting_data_get_string_representation(setting, type_str, type_str_size);
+            strlcpy(type_str, "<default>", type_str_size);
       }
+      else
+         setting_data_get_string_representation(setting, type_str, type_str_size);
    }
 }
 #endif