diff --git a/modules/ripple_app/ledger/ripple_InboundLedger.cpp b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
index 40ef7c216a..a29286944b 100644
--- a/modules/ripple_app/ledger/ripple_InboundLedger.cpp
+++ b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
@@ -526,58 +526,6 @@ void InboundLedger::trigger (Peer::ref peer)
     }
 }
 
-void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL, Peer::ref peer)
-{
-    if (!peer)
-        sendRequest (tmGL);
-    else
-        peer->sendPacket (boost::make_shared<PackedMessage> (tmGL, protocol::mtGET_LEDGER), false);
-}
-
-void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL)
-{
-    boost::recursive_mutex::scoped_lock sl (mLock);
-
-    if (mPeers.empty ())
-        return;
-
-    PackedMessage::pointer packet = boost::make_shared<PackedMessage> (tmGL, protocol::mtGET_LEDGER);
-
-    for (boost::unordered_map<uint64, int>::iterator it = mPeers.begin (), end = mPeers.end (); it != end; ++it)
-    {
-        Peer::pointer peer = getApp().getPeers ().getPeerById (it->first);
-
-        if (peer)
-            peer->sendPacket (packet, false);
-    }
-}
-
-int PeerSet::takePeerSetFrom (const PeerSet& s)
-{
-    int ret = 0;
-    mPeers.clear ();
-
-    for (boost::unordered_map<uint64, int>::const_iterator it = s.mPeers.begin (), end = s.mPeers.end ();
-            it != end; ++it)
-    {
-        mPeers.insert (std::make_pair (it->first, 0));
-        ++ret;
-    }
-
-    return ret;
-}
-
-int PeerSet::getPeerCount () const
-{
-    int ret = 0;
-
-    for (boost::unordered_map<uint64, int>::const_iterator it = mPeers.begin (), end = mPeers.end (); it != end; ++it)
-        if (getApp().getPeers ().hasPeer (it->first))
-            ++ret;
-
-    return ret;
-}
-
 void InboundLedger::filterNodes (std::vector<SHAMapNode>& nodeIDs, std::vector<uint256>& nodeHashes,
                                  std::set<SHAMapNode>& recentNodes, int max, bool aggressive)
 {
diff --git a/modules/ripple_app/node/ripple_NodeStore.cpp b/modules/ripple_app/node/ripple_NodeStore.cpp
index 4b01b60173..764b5a174e 100644
--- a/modules/ripple_app/node/ripple_NodeStore.cpp
+++ b/modules/ripple_app/node/ripple_NodeStore.cpp
@@ -589,13 +589,13 @@ public:
             LedgerIndex ledgerIndex = 1 + r.nextInt (1024 * 1024);
 
             uint256 hash;
-            r.nextBlob (hash.begin (), hash.size ());
+            r.fillBitsRandomly (hash.begin (), hash.size ());
 
             int const payloadBytes = 1 + r.nextInt (maxPayloadBytes);
 
             Blob data (payloadBytes);
 
-            r.nextBlob (data.data (), payloadBytes);
+            r.fillBitsRandomly (data.data (), payloadBytes);
 
             return NodeObject::createObject (type, ledgerIndex, data, hash);
         }
diff --git a/modules/ripple_app/peers/ripple_PeerSet.cpp b/modules/ripple_app/peers/ripple_PeerSet.cpp
index de58e4bfa4..af153ab666 100644
--- a/modules/ripple_app/peers/ripple_PeerSet.cpp
+++ b/modules/ripple_app/peers/ripple_PeerSet.cpp
@@ -106,3 +106,56 @@ bool PeerSet::isActive ()
     boost::recursive_mutex::scoped_lock sl (mLock);
     return !isDone ();
 }
+
+void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL, Peer::ref peer)
+{
+    if (!peer)
+        sendRequest (tmGL);
+    else
+        peer->sendPacket (boost::make_shared<PackedMessage> (tmGL, protocol::mtGET_LEDGER), false);
+}
+
+void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL)
+{
+    boost::recursive_mutex::scoped_lock sl (mLock);
+
+    if (mPeers.empty ())
+        return;
+
+    PackedMessage::pointer packet = boost::make_shared<PackedMessage> (tmGL, protocol::mtGET_LEDGER);
+
+    for (boost::unordered_map<uint64, int>::iterator it = mPeers.begin (), end = mPeers.end (); it != end; ++it)
+    {
+        Peer::pointer peer = getApp().getPeers ().getPeerById (it->first);
+
+        if (peer)
+            peer->sendPacket (packet, false);
+    }
+}
+
+int PeerSet::takePeerSetFrom (const PeerSet& s)
+{
+    int ret = 0;
+    mPeers.clear ();
+
+    for (boost::unordered_map<uint64, int>::const_iterator it = s.mPeers.begin (), end = s.mPeers.end ();
+            it != end; ++it)
+    {
+        mPeers.insert (std::make_pair (it->first, 0));
+        ++ret;
+    }
+
+    return ret;
+}
+
+int PeerSet::getPeerCount () const
+{
+    int ret = 0;
+
+    for (boost::unordered_map<uint64, int>::const_iterator it = mPeers.begin (), end = mPeers.end (); it != end; ++it)
+        if (getApp().getPeers ().hasPeer (it->first))
+            ++ret;
+
+    return ret;
+}
+