diff --git a/src/rpc/RPCHelpers.cpp b/src/rpc/RPCHelpers.cpp
index d1f8b5bcf..c9b5d2c2a 100644
--- a/src/rpc/RPCHelpers.cpp
+++ b/src/rpc/RPCHelpers.cpp
@@ -430,8 +430,9 @@ ledgerHeaderFromRequest(std::shared_ptr<data::BackendInterface const> const& bac
             } else {
                 ledgerSequence = parseStringAsUInt(stringIndex);
             }
-        } else if (indexValue.is_int64())
+        } else if (indexValue.is_int64()) {
             ledgerSequence = indexValue.as_int64();
+}
     } else {
         ledgerSequence = ctx.range.maxSequence;
     }
diff --git a/tests/common/util/TestHttpServer.cpp b/tests/common/util/TestHttpServer.cpp
index df6cf107c..1fe361256 100644
--- a/tests/common/util/TestHttpServer.cpp
+++ b/tests/common/util/TestHttpServer.cpp
@@ -31,7 +31,6 @@
 #include <boost/beast/http/error.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/http/message_generator.hpp>
-#include <boost/beast/http/read.hpp>
 #include <boost/beast/http/string_body.hpp>
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/rpc/handlers/LedgerEntryTests.cpp b/tests/unit/rpc/handlers/LedgerEntryTests.cpp
index 1796b8bef..8fa0ed84d 100644
--- a/tests/unit/rpc/handlers/LedgerEntryTests.cpp
+++ b/tests/unit/rpc/handlers/LedgerEntryTests.cpp
@@ -2960,7 +2960,7 @@ TEST_F(RPCLedgerEntryDeathTest, RangeNotAvailable)
         ));
         checkCalled = true;
         EXPECT_DEATH(
-            { [[maybe_unused]] auto __ = handler.process(req, Context{yield}); }, "Ledger range must be available"
+            { [[maybe_unused]] auto _ = handler.process(req, Context{yield}); }, "Ledger range must be available"
         );
     });