diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index f876cfb1e2..5598eddd11 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -1175,7 +1175,7 @@ public:
         getInboundLedgers().sweep();
         getLedgerReplayer().sweep();
         m_acceptedLedgerCache.sweep();
-        cachedSLEs_.expire();
+        cachedSLEs_.sweep();
         if (sidechainFederator_)
             sidechainFederator_->sweep();
 
diff --git a/src/ripple/app/sidechain/Federator.cpp b/src/ripple/app/sidechain/Federator.cpp
index 6c74745e48..6faae715f6 100644
--- a/src/ripple/app/sidechain/Federator.cpp
+++ b/src/ripple/app/sidechain/Federator.cpp
@@ -959,7 +959,7 @@ Federator::payTxn(
                 seq,
                 signingPK = signingPK_,
                 signingSK = signingSK_,
-                j = j_](Job&) mutable {
+                j = j_]() mutable {
         auto const txnJson = detail::getTxn(
             thisChainSrcAccount, dstAccount, amt, seq, std::move(memos));
 
diff --git a/src/ripple/app/sidechain/FederatorEvents.h b/src/ripple/app/sidechain/FederatorEvents.h
index 7246ef66eb..e0f7ea9c08 100644
--- a/src/ripple/app/sidechain/FederatorEvents.h
+++ b/src/ripple/app/sidechain/FederatorEvents.h
@@ -26,7 +26,6 @@
 #include <ripple/protocol/Issue.h>
 #include <ripple/protocol/STAmount.h>
 #include <ripple/protocol/TER.h>
-#include <beast/utility/Journal.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/ripple/app/sidechain/impl/SidechainListener.cpp b/src/ripple/app/sidechain/impl/SidechainListener.cpp
index 2691b80a70..a754eb3d17 100644
--- a/src/ripple/app/sidechain/impl/SidechainListener.cpp
+++ b/src/ripple/app/sidechain/impl/SidechainListener.cpp
@@ -82,7 +82,7 @@ SidechainListener::send(
     RpcCallback onResponse)
 {
     std::weak_ptr<SidechainListener> selfWeak = shared_from_this();
-    auto job = [cmd, params, onResponse, selfWeak](Job&) {
+    auto job = [cmd, params, onResponse, selfWeak]() {
         auto self = selfWeak.lock();
         if (!self)
             return;
diff --git a/src/ripple/app/sidechain/impl/SignatureCollector.cpp b/src/ripple/app/sidechain/impl/SignatureCollector.cpp
index b567f55590..6157f541f2 100644
--- a/src/ripple/app/sidechain/impl/SignatureCollector.cpp
+++ b/src/ripple/app/sidechain/impl/SignatureCollector.cpp
@@ -80,7 +80,7 @@ SignatureCollector::signAndSubmit(Json::Value const& txJson)
                 chain =
                     isMainChain_ ? Federator::mainChain : Federator::sideChain,
                 f = federator_.weak_from_this(),
-                j = j_](Job&) mutable {
+                j = j_]() mutable {
         auto federator = f.lock();
         if (!federator)
             return;
diff --git a/src/ripple/core/JobTypes.h b/src/ripple/core/JobTypes.h
index dd4c0fe6b6..4d404dd907 100644
--- a/src/ripple/core/JobTypes.h
+++ b/src/ripple/core/JobTypes.h
@@ -91,12 +91,7 @@ private:
         add(jtTRANSACTION,       "transaction",          maxLimit,   250ms,  1000ms);
         add(jtBATCH,             "batch",                maxLimit,   250ms,  1000ms);
         // TODO chose ave latency and peak latency numbers
-        add(jtFEDERATORSIGNATURE,
-            "federatorSignature",
-            maxLimit,
-            false,
-            250ms,
-            1000ms);
+        add(jtFEDERATORSIGNATURE, "federatorSignature", maxLimit,    250ms,  1000ms);
         add(jtADVANCE,           "advanceLedger",        maxLimit,     0ms,     0ms);
         add(jtPUBLEDGER,         "publishNewLedger",     maxLimit,  3000ms,  4500ms);
         add(jtTXN_DATA,          "fetchTxnData",                5,     0ms,     0ms);
diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp
index db82fe8d8d..d4768692ae 100644
--- a/src/ripple/overlay/impl/PeerImp.cpp
+++ b/src/ripple/overlay/impl/PeerImp.cpp
@@ -40,13 +40,13 @@
 #include <ripple/overlay/impl/PeerImp.h>
 #include <ripple/overlay/impl/Tuning.h>
 #include <ripple/overlay/predicates.h>
+#include <ripple/protocol/SField.h>
 #include <ripple/protocol/digest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/beast/core/ostream.hpp>
 
-#include "protocol/SField.h"
 #include <algorithm>
 #include <memory>
 #include <mutex>
@@ -3106,7 +3106,7 @@ PeerImp::onMessage(
          seq,
          m,
          j = sidechainJ,
-         sig = std::move(sig)](Job&) mutable {
+         sig = std::move(sig)]() mutable {
             auto& hashRouter = self->app_.getHashRouter();
             if (auto const toSkip = hashRouter.shouldRelay(suppression))
             {
@@ -3229,7 +3229,7 @@ PeerImp::onMessage(
          m,
          j = sidechainJ,
          chain = *dstChain,
-         sig = std::move(sig)](Job&) mutable {
+         sig = std::move(sig)]() mutable {
             auto& hashRouter = self->app_.getHashRouter();
             if (auto const toSkip = hashRouter.shouldRelay(suppression))
             {