diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp
index 353b7d8872..45c5ff6d4f 100644
--- a/src/LedgerAcquire.cpp
+++ b/src/LedgerAcquire.cpp
@@ -84,9 +84,8 @@ void PeerSet::TimerEntry(boost::weak_ptr<PeerSet> wptr, const boost::system::err
 	if (result == boost::asio::error::operation_aborted)
 		return;
 	boost::shared_ptr<PeerSet> ptr = wptr.lock();
-	if (!ptr)
-		return;
-	ptr->invokeOnTimer();
+	if (ptr)
+		ptr->invokeOnTimer();
 }
 
 LedgerAcquire::LedgerAcquire(const uint256& hash) : PeerSet(hash, LEDGER_ACQUIRE_TIMEOUT), 
diff --git a/src/LedgerAcquire.h b/src/LedgerAcquire.h
index 6781eddf88..b589618299 100644
--- a/src/LedgerAcquire.h
+++ b/src/LedgerAcquire.h
@@ -78,6 +78,7 @@ protected:
 
 public:
 	LedgerAcquire(const uint256& hash);
+	virtual ~LedgerAcquire()			{ ; }
 
 	bool isBase() const					{ return mHaveBase; }
 	bool isAcctStComplete() const		{ return mHaveState; }
diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp
index 71dca921ca..70895ff4f0 100644
--- a/src/LedgerConsensus.cpp
+++ b/src/LedgerConsensus.cpp
@@ -32,7 +32,7 @@ void TransactionAcquire::done()
 {
 	if (mFailed)
 	{
-		Log(lsWARNING) << "Failed to acqiure TXs " << mHash;
+		Log(lsWARNING) << "Failed to acquire TXs " << mHash;
 		theApp->getOPs().mapComplete(mHash, SHAMap::pointer());
 	}
 	else
@@ -108,7 +108,8 @@ bool TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
 				}
 				if (!mMap->addRootNode(getHash(), *nodeDatait, snfWIRE))
 					return false;
-				else mHaveRoot = true;
+				else
+					mHaveRoot = true;
 			}
 			else if (!mMap->addKnownNode(*nodeIDit, *nodeDatait, &sf))
 				return false;
@@ -874,7 +875,8 @@ bool LedgerConsensus::peerGaveNodes(Peer::ref peer, const uint256& setHash,
 	const std::list<SHAMapNode>& nodeIDs, const std::list< std::vector<unsigned char> >& nodeData)
 {
 	boost::unordered_map<uint256, TransactionAcquire::pointer>::iterator acq = mAcquiring.find(setHash);
-	if (acq == mAcquiring.end()) return false;
+	if (acq == mAcquiring.end())
+		return false;
 	return acq->second->takeNodes(nodeIDs, nodeData, peer);
 }
 
diff --git a/src/LedgerConsensus.h b/src/LedgerConsensus.h
index a24a57565a..3833c300b3 100644
--- a/src/LedgerConsensus.h
+++ b/src/LedgerConsensus.h
@@ -37,11 +37,11 @@ protected:
 public:
 
 	TransactionAcquire(const uint256& hash);
+	virtual ~TransactionAcquire()		{ ; }
 
 	SHAMap::pointer getMap()			{ return mMap; }
 
-	bool takeNodes(const std::list<SHAMapNode>& IDs, const std::list< std::vector<unsigned char> >& data,
-		Peer::ref);
+	bool takeNodes(const std::list<SHAMapNode>& IDs, const std::list< std::vector<unsigned char> >& data, Peer::ref);
 };
 
 class LCTransaction