diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 72cef90b83..b587eff0cb 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -24,6 +24,7 @@
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/jss.h>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
@@ -755,9 +756,9 @@ class LedgerRPC_test : public beast::unit_test::Suite
             BEAST_EXPECT(jrr[jss::status] == "success");
             auto const& txns = jrr[jss::ledger][jss::transactions];
             BEAST_EXPECT(txns.isArray() && txns.size() > 0);
-            for (unsigned i = 0; i < txns.size(); ++i)
+            for (auto const& txn : txns)
             {
-                BEAST_EXPECT(txns[i].isMember(jss::ctid));
+                BEAST_EXPECT(txn.isMember(jss::ctid));
             }
         }
 
@@ -773,9 +774,9 @@ class LedgerRPC_test : public beast::unit_test::Suite
             BEAST_EXPECT(jrr[jss::status] == "success");
             auto const& txns = jrr[jss::ledger][jss::transactions];
             BEAST_EXPECT(txns.isArray() && txns.size() > 0);
-            for (unsigned i = 0; i < txns.size(); ++i)
+            for (auto const& txn : txns)
             {
-                BEAST_EXPECT(txns[i].isMember(jss::ctid));
+                BEAST_EXPECT(txn.isMember(jss::ctid));
             }
         }
 
@@ -789,9 +790,9 @@ class LedgerRPC_test : public beast::unit_test::Suite
             BEAST_EXPECT(jrr[jss::status] == "success");
             auto const& txns = jrr[jss::ledger][jss::transactions];
             BEAST_EXPECT(txns.isArray() && txns.size() > 0);
-            for (unsigned i = 0; i < txns.size(); ++i)
+            for (auto const& txn : txns)
             {
-                BEAST_EXPECT(txns[i].isString());
+                BEAST_EXPECT(txn.isString());
             }
         }
     }
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index a59aa1a031..7e659d4e93 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -29,6 +29,7 @@
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/serialize.h>
 
+#include <cstdint>
 #include <exception>
 #include <memory>
 #include <string>
@@ -196,7 +197,7 @@ fillJsonTx(
     }
 
     // compute outgoing CTID
-    if (fill.context && stMeta && stMeta->isFieldPresent(sfTransactionIndex))
+    if ((fill.context != nullptr) && stMeta && stMeta->isFieldPresent(sfTransactionIndex))
     {
         uint32_t const lgrSeq = fill.ledger.seq();
         uint32_t const txnIdx = stMeta->getFieldU32(sfTransactionIndex);