diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index ceb4c4928e..04bd43ba47 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -675,7 +675,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
          file_list_push(menu->selection_buf, "Core Information", MENU_SETTINGS_CORE_INFO, 0);
          file_list_push(menu->selection_buf, "Settings", MENU_SETTINGS_OPTIONS, 0);
 
-         if (g_extern.perfcnt_enable && (current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_enable")))
+         if (g_extern.perfcnt_enable && (current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "perfcnt_enable")))
          {
             *current_setting->value.boolean = g_extern.perfcnt_enable;
             file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_PERFORMANCE_COUNTERS, 0);
diff --git a/settings_data.c b/settings_data.c
index 0df4afd3a2..3de587197c 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -496,6 +496,7 @@ static void general_change_handler(const void *data)
         strlcpy(g_settings.video.font_path, setting->value.string, sizeof(g_settings.video.font_path));
     else if (!strcmp(setting->name, "video_font_size"))
         g_settings.video.font_size = *setting->value.fraction;
+#ifdef HAVE_OVERLAY
     else if (!strcmp(setting->name, "input_overlay_enable"))
     {
         g_settings.input.overlay_enable = *setting->value.boolean;
@@ -517,6 +518,7 @@ static void general_change_handler(const void *data)
            input_overlay_set_alpha_mod(driver.overlay,
                  g_settings.input.overlay_opacity);
     }
+#endif
     else if (!strcmp(setting->name, "audio_enable"))
         g_settings.audio.enable = *setting->value.boolean;
     else if (!strcmp(setting->name, "audio_sync"))
@@ -594,8 +596,11 @@ static void general_change_handler(const void *data)
         g_settings.video.font_enable = *setting->value.boolean;
     else if (!strcmp(setting->name, "video_gpu_screenshot"))
         g_settings.video.gpu_screenshot = *setting->value.boolean;
+#ifdef HAVE_NETPLAY
     else if (!strcmp(setting->name, "netplay_client_swap_input"))
         g_settings.input.netplay_client_swap_input = *setting->value.boolean;
+#endif
+#ifdef HAVE_OVERLAY
     else if (!strcmp(setting->name, "input_overlay"))
     {
         if (driver.overlay)
@@ -619,6 +624,7 @@ static void general_change_handler(const void *data)
            input_overlay_set_scale_factor(driver.overlay,
                  g_settings.input.overlay_scale);
     }
+#endif
     else if (!strcmp(setting->name, "video_allow_rotate"))
         g_settings.video.allow_rotate = *setting->value.boolean;
     else if (!strcmp(setting->name, "video_windowed_fullscreen"))