diff --git a/src/ripple/app/ledger/OrderBookDB.cpp b/src/ripple/app/ledger/OrderBookDB.cpp
index 4f843ddfbe..68c8f15471 100644
--- a/src/ripple/app/ledger/OrderBookDB.cpp
+++ b/src/ripple/app/ledger/OrderBookDB.cpp
@@ -257,7 +257,9 @@ void OrderBookDB::processTxn (
                         auto data = dynamic_cast<const STObject*> (
                             node.peekAtPField (*field));
 
-                        if (data)
+                        if (data &&
+                            data->isFieldPresent (sfTakerPays) &&
+                            data->isFieldPresent (sfTakerGets))
                         {
                             // determine the OrderBook
                             auto listeners = getBookListeners (
diff --git a/src/ripple/app/ledger/impl/LedgerMaster.cpp b/src/ripple/app/ledger/impl/LedgerMaster.cpp
index 50a8ec1371..3605881a16 100644
--- a/src/ripple/app/ledger/impl/LedgerMaster.cpp
+++ b/src/ripple/app/ledger/impl/LedgerMaster.cpp
@@ -670,7 +670,7 @@ public:
     {
         // A new ledger has been accepted as part of the trusted chain
         JLOG (m_journal.debug) << "Ledger " << ledger->info().seq
-                                         << "accepted :" << ledger->getHash ();
+                               << " accepted :" << ledger->getHash ();
         assert (ledger->stateMap().getHash ().isNonZero ());
 
         ledger->setValidated();
diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp
index f7039bb8c1..e226e55478 100644
--- a/src/ripple/app/paths/PathRequests.cpp
+++ b/src/ripple/app/paths/PathRequests.cpp
@@ -113,8 +113,6 @@ void PathRequests::updateAll (std::shared_ptr <ReadView const> const& inLedger,
 
             if (remove)
             {
-                PathRequest::pointer pRequest = wRequest.lock ();
-
                 ScopedLockType sl (mLock);
 
                 // Remove any dangling weak pointers or weak pointers that refer to this path request.
@@ -179,8 +177,8 @@ void PathRequests::insertPathRequest (PathRequest::pointer const& req)
     std::vector<PathRequest::wptr>::iterator it = mRequests.begin ();
     while (it != mRequests.end ())
     {
-        PathRequest::pointer req = it->lock ();
-        if (req && !req->isNew ())
+        PathRequest::pointer r = it->lock ();
+        if (r && !r->isNew ())
             break; // This request has been handled, we come before it
 
         // This is a newer request, we come after it
diff --git a/src/ripple/rpc/impl/Coroutine.cpp b/src/ripple/rpc/impl/Coroutine.cpp
index a23a84a32c..5e71ad1d21 100644
--- a/src/ripple/rpc/impl/Coroutine.cpp
+++ b/src/ripple/rpc/impl/Coroutine.cpp
@@ -52,8 +52,10 @@ void runOnCoroutineImpl(std::shared_ptr<Pull> pull)
 
 void runOnCoroutine(Coroutine const& coroutine)
 {
-    auto pullFunction = [coroutine] (Push& push) {
-        Suspend suspend = [&push] (CoroutineType const& cbc) {
+    auto pullFunction = [coroutine] (Push& push)
+    {
+        Suspend suspend = [&push] (CoroutineType const& cbc)
+        {
             if (push)
                 push (cbc);
         };
diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp
index 2e8d2ffef5..25fb6ba025 100644
--- a/src/ripple/server/impl/ServerHandlerImp.cpp
+++ b/src/ripple/server/impl/ServerHandlerImp.cpp
@@ -347,7 +347,7 @@ ServerHandlerImp::processRequest (
 
     // Provide the JSON-RPC method as the field "command" in the request.
     params[jss::command] = strMethod;
-    JLOG (m_journal.trace) 
+    JLOG (m_journal.trace)
         << "doRpcCommand:" << strMethod << ":" << params;
 
     auto const start (std::chrono::high_resolution_clock::now ());