diff --git a/command.c b/command.c
index 8e3dcff168..30145ecf3d 100755
--- a/command.c
+++ b/command.c
@@ -1768,8 +1768,8 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_AI_SERVICE_TOGGLE:
       {
-         settings_t *settings      = config_get_ptr();
 #ifdef HAVE_TRANSLATE
+         settings_t *settings      = config_get_ptr();
          if (settings->uints.ai_service_mode == 0)
          {
             /* Default mode - pause on call, unpause on second press. */
@@ -1779,15 +1779,11 @@ bool command_event(enum event_command cmd, void *data)
                command_event(CMD_EVENT_AI_SERVICE_CALL, NULL);
             }
             else
-            {
                command_event(CMD_EVENT_UNPAUSE, NULL);
-            }
          }
+         /* Text-to-Speech mode - don't pause */
          else if (settings->uints.ai_service_mode == 1)
-         {
-            /* Text-to-Speech mode - don't pause */
             command_event(CMD_EVENT_AI_SERVICE_CALL, NULL);
-         }
          else
          {
             RARCH_LOG("Invalid AI Service Mode.\n");
@@ -2817,6 +2813,7 @@ TODO: Add a setting for these tweaks */
       case CMD_EVENT_NETPLAY_HOST_TOGGLE:
       case CMD_EVENT_NETPLAY_DISCONNECT:
       case CMD_EVENT_NETPLAY_ENABLE_HOST:
+      case CMD_EVENT_NETPLAY_GAME_WATCH:
          return false;
 #endif
       case CMD_EVENT_FULLSCREEN_TOGGLE:
diff --git a/retroarch.c b/retroarch.c
index 06be343f97..cf9c5bcdce 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -9148,6 +9148,7 @@ bool video_driver_cached_frame(void)
 
    if (current_core.inited)
    {
+#ifdef HAVE_NETWORKING
       if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
          video_frame_net(
                (frame_cache_data != RETRO_HW_FRAME_BUFFER_VALID)
@@ -9155,6 +9156,7 @@ bool video_driver_cached_frame(void)
                frame_cache_width,
                frame_cache_height, frame_cache_pitch);
       else
+#endif
          video_driver_frame(
                (frame_cache_data != RETRO_HW_FRAME_BUFFER_VALID)
                ? frame_cache_data : NULL,