diff --git a/common/MD5.hpp b/common/MD5.hpp
index fdc1277..4551f7d 100644
--- a/common/MD5.hpp
+++ b/common/MD5.hpp
@@ -1,6 +1,7 @@
 #ifndef COMMON_MD5_HPP
 #define COMMON_MD5_HPP
 
+#include <cstddef>
 #include <cstdint>
 
 typedef struct {
diff --git a/common/objectalloc/CObjectHeap.cpp b/common/objectalloc/CObjectHeap.cpp
index 6e4b9c8..f72bc39 100644
--- a/common/objectalloc/CObjectHeap.cpp
+++ b/common/objectalloc/CObjectHeap.cpp
@@ -69,10 +69,10 @@ void* CObjectHeap::Ptr(uint32_t index, uint32_t objSize, uint32_t heapObjects) {
     if (index >= heapObjects) {
         const char* format = "\"%s\", %s = %ld (0x%08X)";
         const uint8_t bytes[4] = {
-            (index >> 24) & 0xFF,
-            (index >> 16) & 0xFF,
-            (index >> 8) & 0xFF,
-            index & 0xFF
+            static_cast<uint8_t>((index >> 24) & 0xFF),
+            static_cast<uint8_t>((index >> 16) & 0xFF),
+            static_cast<uint8_t>((index >> 8) & 0xFF),
+            static_cast<uint8_t>(index & 0xFF)
         };
 
         if (isprint(bytes[0])
@@ -107,10 +107,10 @@ void CObjectHeap::Delete(uint32_t index, uint32_t objSize, uint32_t heapObjects)
     if (index >= heapObjects) {
         const char* format = "\"%s\", %s = %ld (0x%08X)";
         const uint8_t bytes[4] = {
-            (index >> 24) & 0xFF,
-            (index >> 16) & 0xFF,
-            (index >> 8) & 0xFF,
-            index & 0xFF
+            static_cast<uint8_t>((index >> 24) & 0xFF),
+            static_cast<uint8_t>((index >> 16) & 0xFF),
+            static_cast<uint8_t>((index >> 8) & 0xFF),
+            static_cast<uint8_t>(index & 0xFF)
         };
 
         if (isprint(bytes[0]) && isprint(bytes[1]) && isprint(bytes[2]) && isprint(bytes[3])) {