diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
index 52ea99f042a..07526654700 100644
--- a/lib/cmetrics/CMakeLists.txt
+++ b/lib/cmetrics/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # CMetrics Version
 set(CMT_VERSION_MAJOR  0)
 set(CMT_VERSION_MINOR  7)
-set(CMT_VERSION_PATCH  0)
+set(CMT_VERSION_PATCH  1)
 set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
 
 # Include helpers
diff --git a/lib/cmetrics/include/cmetrics/cmt_encode_prometheus_remote_write.h b/lib/cmetrics/include/cmetrics/cmt_encode_prometheus_remote_write.h
index 9351ed6d4e6..0d9f6804e66 100644
--- a/lib/cmetrics/include/cmetrics/cmt_encode_prometheus_remote_write.h
+++ b/lib/cmetrics/include/cmetrics/cmt_encode_prometheus_remote_write.h
@@ -25,7 +25,7 @@
 #include <prometheus_remote_write/remote.pb-c.h>
 
 #define CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_ADD_METADATA           CMT_FALSE
-#define CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_CUTOFF_THRESHOLD       60L*60L*1000000000L
+#define CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_CUTOFF_THRESHOLD       3600000000000L /* One hour in nanoseconds */
 
 #define CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_SUCCESS                0
 #define CMT_ENCODE_PROMETHEUS_REMOTE_WRITE_ALLOCATION_ERROR       1