diff --git a/common/bit_slice.h b/common/bit_slice.h
index 9f1764339..fd755d9f6 100644
--- a/common/bit_slice.h
+++ b/common/bit_slice.h
@@ -58,7 +58,7 @@
 #define INSERTF64(src1, start1, src2, start2, len) MERGE64((src1), EXTRACT64((src2), (start2), (len)), (start1), (len))
 #define EXT64(src, end, start) EXTRACT64(src, start, end - start + 1)
 
-#ifndef __cplusplus
+#if !defined(__cplusplus) && (__STDC_VERSION__ < 202311L)
 enum cpp_bool
 {
     false = 0,
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index 023983602..82fbfb99b 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -202,7 +202,7 @@ class SyncOwner():
 
 PSID_PCIE_SWITCH_CX7 = [
     "ABC0000000002", "CW_0000000007", "EZO0000000001", "FB_0000000049",
-    "GGL0000000001", "LNV0000000064", "MSF0000000047", "MT_0000000747",
+    "LNV0000000064", "MSF0000000047", "MT_0000000747", "WLF14TZ100601",
     "MT_0000000764", "MT_0000000891", "MT_0000000920", "MT_0000000921",
     "MT_0000000922", "MT_0000000929", "MT_0000000930", "MT_0000000937",
     "MT_0000001016", "MT_0000001019", "MT_0000001238", "MT_0000001250",
@@ -214,7 +214,7 @@ class SyncOwner():
     "OMN0000000001", "OMN0000000003", "ORC0000000009", "ORC0000000014",
     "WLF144L100201", "WLF144L100701", "WLF144L100801", "WLF144LF000000",
     "WLF144LF001005", "WLF144LFZ10000", "WLF14TZ100101", "WLF14TZ100201",
-    "WLF14TZ100301", "WLF14TZ100601"
+    "WLF14TZ100301"
 ]
 
 PSID_PCIE_SWITCH_CX8 = [
diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
index e5af41573..fc95114eb 100644
--- a/small_utils/mtserver.c
+++ b/small_utils/mtserver.c
@@ -607,7 +607,7 @@ void usage(const char* s)
 }
 
 /* ////////////////////////////////////////////////////////////////////// */
-void mySignal()
+void mySignal(int)
 {
     exit(0);
 }