diff --git a/system/include/platform.h b/system/include/platform.h
index e405ba7e622..b703e13ba10 100644
--- a/system/include/platform.h
+++ b/system/include/platform.h
@@ -493,7 +493,7 @@ typedef unsigned __int64 hash64_t;
 typedef unsigned __int64 __uint64;
 typedef __uint64 offset_t;
 typedef unsigned char byte;
-typedef __int64 cycle_t;
+typedef __uint64 cycle_t;                 // This must be unsigned to avoid integer overflow issues when subtracting
 typedef unsigned __int64 timestamp_type;
 
 // BUILD_TAG not needed here anymore - defined in build_tag.h
diff --git a/system/jlib/jdebug.cpp b/system/jlib/jdebug.cpp
index 76a4069b61d..742fe8e1630 100644
--- a/system/jlib/jdebug.cpp
+++ b/system/jlib/jdebug.cpp
@@ -502,8 +502,8 @@ class TimeSectionInfo : public MappingBase
     unsigned getCount() const { return count; }
 
     StringAttr  scope;
-    __int64 totalcycles;
-    __int64 maxcycles;
+    cycle_t totalcycles;
+    cycle_t maxcycles;
     unsigned count;
 };