diff --git a/Headers/DebugServer2/Base.h b/Headers/DebugServer2/Base.h
index 9659aa3e..94983d4f 100644
--- a/Headers/DebugServer2/Base.h
+++ b/Headers/DebugServer2/Base.h
@@ -19,6 +19,7 @@
 typedef SSIZE_T ssize_t;
 #endif
 #else
+#include <cstdint>
 #include <cstdlib>
 #endif
 #include <iostream>
@@ -117,7 +118,7 @@ typedef SSIZE_T ssize_t;
 // structure, and not held as a reference or a pointer.
 template <typename T>
 typename std::enable_if<
-    !std::is_pointer<T>::value && std::is_pod<T>::value,
+    !std::is_pointer_v<T> && std::is_standard_layout_v<T>,
     size_t>::type static inline constexpr array_sizeof(T const &array) {
   return sizeof(array) / (reinterpret_cast<uintptr_t>(&array[1]) -
                           reinterpret_cast<uintptr_t>(&array[0]));
diff --git a/Headers/DebugServer2/Core/CPUTypes.h b/Headers/DebugServer2/Core/CPUTypes.h
index 15927b29..9e76e0d3 100644
--- a/Headers/DebugServer2/Core/CPUTypes.h
+++ b/Headers/DebugServer2/Core/CPUTypes.h
@@ -258,8 +258,8 @@ enum CPUSubType {
 };
 
 static inline bool CPUTypeIs64Bit(CPUType type) {
-  return type & kCPUArchABI64 || type == kCPUTypeALPHA ||
-         type == kCPUTypeRISCV64;
+  return static_cast<int>(type) & static_cast<int>(kCPUArchABI64) ||
+         type == kCPUTypeALPHA || type == kCPUTypeRISCV64;
 }
 
 char const *GetCPUTypeName(CPUType type);