LibretroAdmin

diff --git a/libretro/main.cpp b/libretro/main.cpp
index 2d9bef353..033981238 100644
--- a/libretro/main.cpp
+++ b/libretro/main.cpp
@@ -53,7 +53,8 @@ static struct retro_perf_callback perf_cb;
 #endif
 
 static bool libretro_supports_option_categories = false;
-static bool init_failed = false;
+bool libretro_init = true;

LibretroAdmin

diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c
index b8d239d12d..6579659291 100644
--- a/gfx/gfx_thumbnail_path.c
+++ b/gfx/gfx_thumbnail_path.c
@@ -688,8 +688,11 @@ bool gfx_thumbnail_update_path(
          cp = strstr(content_name, ".zip#");
          if( cp ) cp[4]=0;
          cp = strrchr( content_name,'.');
-         strcpy(cp,".png");
-         strcpy(thumbnail_path,content_name);

LibretroAdmin

diff --git a/nxengine/extract-auto/extractorg.c b/nxengine/extract-auto/extractorg.c
index 0d2b3da..779a4ba 100644
--- a/nxengine/extract-auto/extractorg.c
+++ b/nxengine/extract-auto/extractorg.c
@@ -89,7 +89,7 @@ files[] =
    { NULL, 0, 0, 0 }
 };
 
-char *org_data[42];
+unsigned char *org_data[42];

LibretroAdmin

/*
**  WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols
**
**  This file contains TCP/IP specific information for use
**  by WinSock2 compatible applications.
**
** Copyright (c) Microsoft Corporation. All rights reserved.
**
**  To provide the backward compatibility, all the TCP/IP
**  specific definitions that were included in the WINSOCK.H

LibretroAdmin

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 09e93e1e37..0166595342 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -3793,6 +3793,10 @@ bool menu_shader_manager_save_preset_internal(
             strlcat(fullname, preset_ext, sizeof(fullname));
          }
       }
+      else
+         strlcat(fullname,