diff --git a/cores/libretro-net-retropad/net_retropad_core.c b/cores/libretro-net-retropad/net_retropad_core.c
index e9580ba7c5..f86ea8eb83 100644
--- a/cores/libretro-net-retropad/net_retropad_core.c
+++ b/cores/libretro-net-retropad/net_retropad_core.c
@@ -581,7 +581,7 @@ static void retropad_update_input(void)
    }
 }
 
-static void netretropad_open_udp_socket(void)
+static void open_UDP_socket()
 {
    socket_target_t in_target;
 
@@ -702,7 +702,7 @@ void NETRETROPAD_CORE_PREFIX(retro_set_video_refresh)(retro_video_refresh_t cb)
 void NETRETROPAD_CORE_PREFIX(retro_reset)(void)
 {
    netretropad_check_variables();
-   netretropad_open_udp_socket();
+   open_UDP_socket();
 }
 
 void NETRETROPAD_CORE_PREFIX(retro_run)(void)
@@ -985,7 +985,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
 bool NETRETROPAD_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
 {
    netretropad_check_variables();
-   netretropad_open_udp_socket();
+   open_UDP_socket();
 
    /* If a .ratst file is given (only possible via command line),
     * initialize test sequence. */
diff --git a/deps/glslang/glslang/glslang/Include/PoolAlloc.h b/deps/glslang/glslang/glslang/Include/PoolAlloc.h
index 39f5dccc0a..9232213f97 100644
--- a/deps/glslang/glslang/glslang/Include/PoolAlloc.h
+++ b/deps/glslang/glslang/glslang/Include/PoolAlloc.h
@@ -63,6 +63,22 @@
 
 namespace glslang {
 
+// If we are using guard blocks, we must track each individual
+// allocation.  If we aren't using guard blocks, these
+// never get instantiated, so won't have any impact.
+//
+
+class TAllocation {
+public:
+    TAllocation(size_t size, unsigned char* mem, TAllocation* prev = 0) :
+        size(size), mem(mem), prevAlloc(prev) { }
+
+private:
+    size_t size;                  // size of the user data area
+    unsigned char* mem;           // beginning of our allocation (pts to header)
+    TAllocation* prevAlloc;       // prior allocation in the chain
+};
+
 //
 // There are several stacks.  One is to track the pushing and popping
 // of the user, and not yet implemented.  The others are simply a
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 58d07bf924..58fde4ba41 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -8108,7 +8108,7 @@ static enum menu_action ozone_parse_menu_entry_action(
 
             if (     !menu_navigation_wraparound_enable
                   && selection == ozone->system_tab_end + horizontal_list_size)
-               new_selection   = (int)selection;
+               new_selection   = selection;
 
             if (new_selection != (int)selection)
             {