diff --git a/retroarch.c b/retroarch.c
index c90888c1d2..046fa046a3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1351,34 +1351,28 @@ void rarch_main_set_state(unsigned cmd)
    {
       case RARCH_ACTION_STATE_MENU_RUNNING:
 #ifdef HAVE_MENU
+         menu_driver_toggle(true);
+
+         /* Menu should always run with vsync on. */
+         event_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE);
+         /* Stop all rumbling before entering the menu. */
+         event_command(EVENT_CMD_RUMBLE_STOP);
+
+         if (settings->menu.pause_libretro)
+            event_command(EVENT_CMD_AUDIO_STOP);
+
+         /* Override keyboard callback to redirect to menu instead.
+          * We'll use this later for something ...
+          * FIXME: This should probably be moved to menu_common somehow. */
+         if (global)
          {
-            menu_handle_t *menu = menu_driver_get_ptr();
-            if (!menu)
-               return;
-
-            menu_driver_toggle(true);
-
-            /* Menu should always run with vsync on. */
-            event_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE);
-            /* Stop all rumbling before entering the menu. */
-            event_command(EVENT_CMD_RUMBLE_STOP);
-
-            if (settings->menu.pause_libretro)
-               event_command(EVENT_CMD_AUDIO_STOP);
-
-            /* Override keyboard callback to redirect to menu instead.
-             * We'll use this later for something ...
-             * FIXME: This should probably be moved to menu_common somehow. */
-            if (global)
-            {
-               global->frontend_key_event = system->key_event;
-               system->key_event          = menu_input_key_event;
-               system->frame_time_last    = 0;
-            }
-
-            menu_entries_set_refresh();
-            menu_driver_set_alive();
+            global->frontend_key_event = system->key_event;
+            system->key_event          = menu_input_key_event;
+            system->frame_time_last    = 0;
          }
+
+         menu_entries_set_refresh();
+         menu_driver_set_alive();
 #endif
          break;
       case RARCH_ACTION_STATE_LOAD_CONTENT:
diff --git a/screenshot.c b/screenshot.c
index 05c83863bd..ed1737db80 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -383,13 +383,13 @@ bool screenshot_dump(const char *folder, const void *frame,
    if (!out_buffer)
       return false;
 
-   scaler.in_width   = width;
-   scaler.in_height  = height;
-   scaler.out_width  = width;
-   scaler.out_height = height;
-   scaler.in_stride  = -pitch;
-   scaler.out_stride = width * 3;
-   scaler.out_fmt = SCALER_FMT_BGR24;
+   scaler.in_width    = width;
+   scaler.in_height   = height;
+   scaler.out_width   = width;
+   scaler.out_height  = height;
+   scaler.in_stride   = -pitch;
+   scaler.out_stride  = width * 3;
+   scaler.out_fmt     = SCALER_FMT_BGR24;
    scaler.scaler_type = SCALER_TYPE_POINT;
 
    if (bgr24)