diff --git a/movie.c b/movie.c
index f812e95e56..d637084084 100644
--- a/movie.c
+++ b/movie.c
@@ -333,7 +333,8 @@ static void bsv_movie_init_state(void)
       runloop_msg_queue_push(msg_hash_to_str(MSG_STARTING_MOVIE_PLAYBACK),
             2, 180, false);
       RARCH_LOG("%s.\n", msg_hash_to_str(MSG_STARTING_MOVIE_PLAYBACK));
-      settings->rewind_granularity = 1;
+
+      configuration_set_uint(settings, settings->rewind_granularity, 1);
    }
    else if (bsv_movie_state.movie_start_recording)
    {
@@ -357,7 +358,8 @@ static void bsv_movie_init_state(void)
       RARCH_LOG("%s \"%s\".\n",
             msg_hash_to_str(MSG_STARTING_MOVIE_RECORD_TO),
             bsv_movie_state.movie_start_path);
-      settings->rewind_granularity = 1;
+
+      configuration_set_uint(settings, settings->rewind_granularity, 1);
    }
 }
 
@@ -497,11 +499,12 @@ static bool runloop_check_movie_record(void)
 
 static bool runloop_check_movie_init(void)
 {
-   char msg[128]              = {0};
-   char path[PATH_MAX_LENGTH] = {0};
+   char msg[128], path[PATH_MAX_LENGTH];
    settings_t *settings       = config_get_ptr();
 
-   settings->rewind_granularity = 1;
+   msg[0] = path[0]           = '\0';
+
+   configuration_set_uint(settings, settings->rewind_granularity, 1);
 
    if (settings->state_slot > 0)
       snprintf(path, sizeof(path), "%s%d",
diff --git a/retroarch.c b/retroarch.c
index 90a35a1d72..c2573e613b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -718,7 +718,9 @@ static void retroarch_parse_input(int argc, char *argv[])
          case RA_OPT_STATELESS:
             {
                settings_t *settings  = config_get_ptr();
-               settings->netplay.stateless_mode = true;
+
+               configuration_set_bool(settings, settings->netplay.stateless_mode, true);
+
                retroarch_override_setting_set(
                      RARCH_OVERRIDE_SETTING_NETPLAY_STATELESS_MODE, NULL);
             }
@@ -729,7 +731,8 @@ static void retroarch_parse_input(int argc, char *argv[])
                settings_t *settings  = config_get_ptr();
                retroarch_override_setting_set(
                      RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES, NULL);
-               settings->netplay.check_frames = (int)strtoul(optarg, NULL, 0);
+
+               configuration_set_int(settings, settings->netplay.check_frames, (int)strtoul(optarg, NULL, 0));
             }
             break;
 
@@ -738,7 +741,7 @@ static void retroarch_parse_input(int argc, char *argv[])
                settings_t *settings  = config_get_ptr();
                retroarch_override_setting_set(
                      RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT, NULL);
-               settings->netplay.port = (unsigned)strtoul(optarg, NULL, 0);
+               configuration_set_uint(settings, settings->netplay.port, (int)strtoul(optarg, NULL, 0));
             }
             break;