diff --git a/src/cpp/ripple/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp
index d5cd438fab..904af7e8e4 100644
--- a/src/cpp/ripple/JobQueue.cpp
+++ b/src/cpp/ripple/JobQueue.cpp
@@ -118,6 +118,14 @@ int JobQueue::getJobCount(JobType t)
 	return (c == mJobCounts.end()) ? 0 : c->second.first;
 }
 
+int JobQueue::getJobCountTotal(JobType t)
+{
+	boost::mutex::scoped_lock sl(mJobLock);
+
+	std::map< JobType, std::pair<int, int> >::iterator c = mJobCounts.find(t);
+	return (c == mJobCounts.end()) ? 0 : (c->second.first + c->second.second);
+}
+
 int JobQueue::getJobCountGE(JobType t)
 { // return the number of jobs at this priority level or greater
 	int ret = 0;
diff --git a/src/cpp/ripple/JobQueue.h b/src/cpp/ripple/JobQueue.h
index 159b7dfa6a..bf439cc6e1 100644
--- a/src/cpp/ripple/JobQueue.h
+++ b/src/cpp/ripple/JobQueue.h
@@ -103,8 +103,9 @@ public:
 
 	void addJob(JobType type, const std::string& name, const boost::function<void(Job&)>& job);
 
-	int getJobCount(JobType t);		// Jobs at this priority
-	int getJobCountGE(JobType t);	// All jobs at or greater than this priority
+	int getJobCount(JobType t);			// Jobs waiting at this priority
+	int getJobCountTotal(JobType t);	// Jobs waiting plus running at this priority
+	int getJobCountGE(JobType t);		// All waiting jobs at or greater than this priority
 	std::vector< std::pair<JobType, std::pair<int, int> > > getJobCounts(); // jobs waiting, threads doing
 
 	void shutdown();
diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp
index 2fbf26eb18..52ce07c506 100644
--- a/src/cpp/ripple/Ledger.cpp
+++ b/src/cpp/ripple/Ledger.cpp
@@ -512,7 +512,7 @@ void Ledger::saveAcceptedLedger(Job&, bool fromConsensus)
 	if (!fromConsensus)
 		dropCache();
 
-	if (theApp->getJobQueue().getJobCount(jtPUBOLDLEDGER) == 0)
+	if (theApp->getJobQueue().getJobCountTotal(jtPUBOLDLEDGER) == 0)
 		theApp->getLedgerMaster().resumeAcquiring();
 }
 
diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp
index 4d79e51668..892d70822c 100644
--- a/src/cpp/ripple/LedgerMaster.cpp
+++ b/src/cpp/ripple/LedgerMaster.cpp
@@ -388,7 +388,7 @@ void LedgerMaster::setFullLedger(Ledger::pointer ledger)
 		return;
 	}
 
-	if (theApp->getJobQueue().getJobCount(jtPUBOLDLEDGER) > 2)
+	if (theApp->getJobQueue().getJobCountTotal(jtPUBOLDLEDGER) > 1)
 	{
 		cLog(lsDEBUG) << "Too many pending ledger saves";
 		return;
diff --git a/src/cpp/websocketpp/src/messages/data.hpp b/src/cpp/websocketpp/src/messages/data.hpp
index ff1b02bdcd..3d2d83222a 100644
--- a/src/cpp/websocketpp/src/messages/data.hpp
+++ b/src/cpp/websocketpp/src/messages/data.hpp
@@ -212,12 +212,12 @@ private:
     typedef websocketpp::processor::hybi_util::masking_key_type masking_key_type;
     
     friend void intrusive_ptr_add_ref(const data * s) {
-        boost::unique_lock<boost::mutex> lock(s->m_lock);
+        boost::unique_lock<boost::recursive_mutex> lock(s->m_lock);
         ++s->m_ref_count;
     }
     
     friend void intrusive_ptr_release(const data * s) {
-        boost::unique_lock<boost::mutex> lock(s->m_lock);
+        boost::unique_lock<boost::recursive_mutex> lock(s->m_lock);
         
         // TODO: thread safety
         long count = --s->m_ref_count;
@@ -259,7 +259,7 @@ private:
     mutable boost::detail::atomic_count m_ref_count;
     mutable pool_weak_ptr               m_pool;
     mutable bool                        m_live;
-    mutable boost::mutex                m_lock;
+    mutable boost::recursive_mutex      m_lock;
 };
 
 typedef boost::intrusive_ptr<data> data_ptr;