diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index b8a2973..704fe99 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -3302,7 +3302,7 @@ Iterator firstGeq(Node *n, std::string_view key) {
 [[maybe_unused]] InternalVersionT
 checkMaxVersion(Node *root, Node *node, InternalVersionT oldestVersion,
                 bool &success, ConflictSet::Impl *impl) {
-  InternalVersionT expected{0};
+  auto expected = InternalVersionT::zero;
   if (node->entryPresent) {
     expected = std::max(expected, node->entry.pointVersion);
   }
diff --git a/Internal.h b/Internal.h
index 6380afa..58ce4cd 100644
--- a/Internal.h
+++ b/Internal.h
@@ -718,12 +718,12 @@ template <class ConflictSetImpl> struct TestDriver {
         reads[i].readVersion = v;
 #if DEBUG_VERBOSE && !defined(NDEBUG)
         if (reads[i].end.len == 0) {
-          fprintf(stderr, "Read: {%s} @ %d\n",
-                  printable(reads[i].begin).c_str(), int(reads[i].readVersion));
+          fprintf(stderr, "Read: {%s} @ %" PRId64 "\n",
+                  printable(reads[i].begin).c_str(), reads[i].readVersion);
         } else {
-          fprintf(stderr, "Read: [%s, %s) @ %d\n",
+          fprintf(stderr, "Read: [%s, %s) @ %" PRId64 "\n",
                   printable(reads[i].begin).c_str(),
-                  printable(reads[i].end).c_str(), int(reads[i].readVersion));
+                  printable(reads[i].end).c_str(), reads[i].readVersion);
         }
 #endif
       }