diff --git a/command.c b/command.c
index 5fb5108cc3..228d324d3f 100644
--- a/command.c
+++ b/command.c
@@ -2074,7 +2074,7 @@ bool command_event(enum event_command cmd, void *data)
       case CMD_EVENT_AUDIO_MUTE_TOGGLE:
          {
             settings_t *settings      = config_get_ptr();
-            const char *msg = !settings->audio.mute_enable ?
+            const char *msg           = !settings->audio.mute_enable ?
                msg_hash_to_str(MSG_AUDIO_MUTED):
                msg_hash_to_str(MSG_AUDIO_UNMUTED);
 
diff --git a/configuration.h b/configuration.h
index 5d03b25e04..e133c6298d 100644
--- a/configuration.h
+++ b/configuration.h
@@ -505,6 +505,10 @@ typedef struct settings
    settings->modified = true; \
    var = newvar
 
+#define configuration_set_uint(settings, var, newvar) \
+   settings->modified = true; \
+   var = newvar
+
 #define configuration_set_int(settings, var, newvar) \
    settings->modified = true; \
    var = newvar
diff --git a/gfx/common/d3d_common.cpp b/gfx/common/d3d_common.cpp
index 5323c9dd16..28fd11491d 100644
--- a/gfx/common/d3d_common.cpp
+++ b/gfx/common/d3d_common.cpp
@@ -577,13 +577,14 @@ void d3d_device_free(LPDIRECT3DDEVICE dev, LPDIRECT3D pd3d)
 
 D3DTEXTUREFILTERTYPE d3d_translate_filter(unsigned type)
 {
-   settings_t *settings = config_get_ptr();
-
    switch (type)
    {
       case RARCH_FILTER_UNSPEC:
-         if (!settings->video.smooth)
-            break;
+         {
+            settings_t *settings = config_get_ptr();
+            if (!settings->video.smooth)
+               break;
+         }
          /* fall-through */
       case RARCH_FILTER_LINEAR:
          return D3DTEXF_LINEAR;
diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index 64192c9c96..826b95741b 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -834,11 +834,11 @@ void win32_set_window(unsigned *width, unsigned *height,
       bool fullscreen, bool windowed_full, void *rect_data)
 {
 #ifndef _XBOX
-   settings_t *settings  = config_get_ptr();
    RECT *rect            = (RECT*)rect_data;
 
    if (!fullscreen || windowed_full)
    {
+      settings_t *settings      = config_get_ptr();
       const ui_window_t *window = ui_companion_driver_get_window_ptr();
 
       if (!fullscreen && settings->ui.menubar_enable)
diff --git a/gfx/drivers_shader/slang_reflection.cpp b/gfx/drivers_shader/slang_reflection.cpp
index cbe2d21ed4..7c85431869 100644
--- a/gfx/drivers_shader/slang_reflection.cpp
+++ b/gfx/drivers_shader/slang_reflection.cpp
@@ -33,8 +33,10 @@ static bool slang_texture_semantic_is_array(slang_texture_semantic sem)
          return true;
 
       default:
-         return false;
+         break;
    }
+
+   return false;
 }
 
 slang_reflection::slang_reflection()
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 39b396d011..cb7df6c555 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -58,7 +58,9 @@ static void input_autoconfigure_joypad_reindex_devices(autoconfig_params_t *para
    settings_t      *settings = config_get_ptr();
 
    for(i = 0; i < params->max_users; i++)
-      settings->input.device_name_index[i] = 0;
+   {
+      configuration_set_uint(settings, settings->input.device_name_index[i], 0);
+   }
 
    for(i = 0; i < params->max_users; i++)
    {
@@ -70,7 +72,10 @@ static void input_autoconfigure_joypad_reindex_devices(autoconfig_params_t *para
       {
          if(string_is_equal(tmp, settings->input.device_names[j])
                && settings->input.device_name_index[i] == 0)
-            settings->input.device_name_index[j] = k++;
+         {
+            configuration_set_uint(settings, settings->input.device_name_index[j], k);
+            k++;
+         }
       }
    }
 }
@@ -152,7 +157,9 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
    block_osd_spam = settings->input.autoconfigured[params->idx]
       && !string_is_empty(params->name);
 
-   settings->input.autoconfigured[params->idx] = true;
+   configuration_set_bool(settings,
+         settings->input.autoconfigured[params->idx], true);
+
    input_autoconfigure_joypad_conf(conf,
          settings->input.autoconf_binds[params->idx]);
 
@@ -165,7 +172,9 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
          task_set_title(task, strdup(msg));
       remote_is_bound = true;
       if (params->idx == 0)
-         settings->input.swap_override = true;
+      {
+         configuration_set_bool(settings, settings->input.swap_override, true);
+      }
    }
    else
    {
@@ -177,8 +186,12 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
 
       /* allow overriding the swap menu controls for player 1*/
       if (params->idx == 0)
+      {
          if (config_get_bool(conf, "input_swap_override", &tmp))
-            settings->input.swap_override = tmp;
+         {
+            configuration_set_bool(settings, settings->input.swap_override, tmp);
+         }
+      }
 
       if (!block_osd_spam)
          task_set_title(task, strdup(msg));
@@ -423,8 +436,9 @@ bool input_autoconfigure_connect(
    state->max_users = settings->input.max_users;
 
    input_config_set_device_name(state->idx, state->name);
-   settings->input.pid[state->idx]  = state->pid;
-   settings->input.vid[state->idx]  = state->vid;
+
+   configuration_set_int(settings, settings->input.pid[state->idx], state->pid);
+   configuration_set_int(settings, settings->input.vid[state->idx], state->vid);
 
 
    for (i = 0; i < RARCH_BIND_LIST_END; i++)
@@ -434,7 +448,9 @@ bool input_autoconfigure_connect(
       settings->input.autoconf_binds[state->idx][i].joykey_label[0]  = '\0';
       settings->input.autoconf_binds[state->idx][i].joyaxis_label[0] = '\0';
    }
-   settings->input.autoconfigured[state->idx] = false;
+
+   configuration_set_bool(settings,
+         settings->input.autoconfigured[state->idx], false);
 
    task->state   = state;
    task->handler = input_autoconfigure_connect_handler;