diff --git a/src/ripple/validators/api/Source.h b/src/ripple/validators/api/Source.h
index 8fdaebae4..fbafa669d 100644
--- a/src/ripple/validators/api/Source.h
+++ b/src/ripple/validators/api/Source.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
 
@@ -25,7 +24,7 @@ namespace ripple {
 namespace Validators {
 
 /** A source of validator descriptors. */
-class Source
+class Source : public SharedObject
 {
 public:
     /** A Source's descriptor for a Validator. */
diff --git a/src/ripple/validators/api/Types.h b/src/ripple/validators/api/Types.h
index f801c5cf6..835f9c635 100644
--- a/src/ripple/validators/api/Types.h
+++ b/src/ripple/validators/api/Types.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_TYPES_H_INCLUDED
 #define RIPPLE_VALIDATORS_TYPES_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/ChosenList.h b/src/ripple/validators/impl/ChosenList.h
index b2eb9da36..d7f338ac6 100644
--- a/src/ripple/validators/impl/ChosenList.h
+++ b/src/ripple/validators/impl/ChosenList.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED
 #define RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/Logic.h b/src/ripple/validators/impl/Logic.h
index 0e90381d5..8a331ad62 100644
--- a/src/ripple/validators/impl/Logic.h
+++ b/src/ripple/validators/impl/Logic.h
@@ -293,7 +293,8 @@ public:
 
         {
             SharedState::Access state (m_state);
-            SourceDesc& desc (*state->sources.emplace_back ());
+            state->sources.resize (state->sources.size() + 1);
+            SourceDesc& desc (state->sources.back());
             desc.source = source;
             m_store.insert (desc);
         }
@@ -409,7 +410,7 @@ public:
     /** Perform a fetch on the source. */
     void fetch (SourceDesc& desc)
     {
-        m_journal.info << "fetch ('" << desc.source->name() << "')";
+        m_journal.info << "fetch " << desc.source->name();
 
         Source::Result result (desc.source->fetch (m_journal));
 
diff --git a/src/ripple/validators/impl/Source.cpp b/src/ripple/validators/impl/Source.cpp
index 4437494a8..7fab99a43 100644
--- a/src/ripple/validators/impl/Source.cpp
+++ b/src/ripple/validators/impl/Source.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
diff --git a/src/ripple/validators/impl/SourceDesc.h b/src/ripple/validators/impl/SourceDesc.h
index 05cda6769..938d56d70 100644
--- a/src/ripple/validators/impl/SourceDesc.h
+++ b/src/ripple/validators/impl/SourceDesc.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_SOURCEDESC_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCEDESC_H_INCLUDED
 
@@ -34,7 +33,7 @@ struct SourceDesc
         statusFailed
     };
 
-    ScopedPointer <Source> source;
+    SharedPtr <Source> source;
     Status status;
     Time whenToFetch;
     int numberOfFailures;
@@ -64,7 +63,7 @@ struct SourceDesc
     }
 };
 
-typedef DynamicList <SourceDesc> SourcesType;
+typedef std::vector <SourceDesc> SourcesType;
 
 }
 }
diff --git a/src/ripple/validators/impl/SourceFile.cpp b/src/ripple/validators/impl/SourceFile.cpp
index 1ae6624d7..30b4e1842 100644
--- a/src/ripple/validators/impl/SourceFile.cpp
+++ b/src/ripple/validators/impl/SourceFile.cpp
@@ -17,11 +17,12 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
-class SourceFileImp : public SourceFile
+class SourceFileImp
+    : public SourceFile
+    , public LeakChecked <SourceFileImp>
 {
 public:
     SourceFileImp (File const& file)
diff --git a/src/ripple/validators/impl/SourceFile.h b/src/ripple/validators/impl/SourceFile.h
index 4d753381d..2bf573143 100644
--- a/src/ripple/validators/impl/SourceFile.h
+++ b/src/ripple/validators/impl/SourceFile.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_SOURCEFILE_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCEFILE_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/SourceStrings.cpp b/src/ripple/validators/impl/SourceStrings.cpp
index 21827d3bb..c2485306d 100644
--- a/src/ripple/validators/impl/SourceStrings.cpp
+++ b/src/ripple/validators/impl/SourceStrings.cpp
@@ -17,11 +17,12 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
-class SourceStringsImp : public SourceStrings
+class SourceStringsImp
+    : public SourceStrings
+    , public LeakChecked <SourceStringsImp>
 {
 public:
     SourceStringsImp (
diff --git a/src/ripple/validators/impl/SourceStrings.h b/src/ripple/validators/impl/SourceStrings.h
index 0bed11113..585eefc9a 100644
--- a/src/ripple/validators/impl/SourceStrings.h
+++ b/src/ripple/validators/impl/SourceStrings.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_SOURCESTRINGS_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCESTRINGS_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/SourceURL.cpp b/src/ripple/validators/impl/SourceURL.cpp
index 52e142258..85ff2950d 100644
--- a/src/ripple/validators/impl/SourceURL.cpp
+++ b/src/ripple/validators/impl/SourceURL.cpp
@@ -17,11 +17,12 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
-class SourceURLImp : public SourceURL
+class SourceURLImp
+    : public SourceURL
+    , public LeakChecked <SourceURLImp>
 {
 public:
     explicit SourceURLImp (URL const& url)
diff --git a/src/ripple/validators/impl/SourceURL.h b/src/ripple/validators/impl/SourceURL.h
index ca63ca510..726e379f4 100644
--- a/src/ripple/validators/impl/SourceURL.h
+++ b/src/ripple/validators/impl/SourceURL.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_SOURCEURL_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCEURL_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/Store.h b/src/ripple/validators/impl/Store.h
index f24f8ff52..0c7b391ff 100644
--- a/src/ripple/validators/impl/Store.h
+++ b/src/ripple/validators/impl/Store.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_STORE_H_INCLUDED
 #define RIPPLE_VALIDATORS_STORE_H_INCLUDED
 
diff --git a/src/ripple/validators/impl/StoreSqdb.cpp b/src/ripple/validators/impl/StoreSqdb.cpp
index ef62b6326..7ac83f2ac 100644
--- a/src/ripple/validators/impl/StoreSqdb.cpp
+++ b/src/ripple/validators/impl/StoreSqdb.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
diff --git a/src/ripple/validators/impl/StoreSqdb.h b/src/ripple/validators/impl/StoreSqdb.h
index 9ce8f96ac..34ba4c306 100644
--- a/src/ripple/validators/impl/StoreSqdb.h
+++ b/src/ripple/validators/impl/StoreSqdb.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_STORESQDB_H_INCLUDED
 #define RIPPLE_VALIDATORS_STORESQDB_H_INCLUDED
 
@@ -25,7 +24,9 @@ namespace ripple {
 namespace Validators {
 
 /** Database persistence for Validators using SQLite */
-class StoreSqdb : public Store
+class StoreSqdb
+    : public Store
+    , public LeakChecked <StoreSqdb>
 {
 public:
     explicit StoreSqdb (Journal journal = Journal());
diff --git a/src/ripple/validators/impl/Tests.cpp b/src/ripple/validators/impl/Tests.cpp
index 7c2935449..d4d2862d8 100644
--- a/src/ripple/validators/impl/Tests.cpp
+++ b/src/ripple/validators/impl/Tests.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
diff --git a/src/ripple/validators/impl/Utilities.cpp b/src/ripple/validators/impl/Utilities.cpp
index 3d3e8b9dd..a53d23356 100644
--- a/src/ripple/validators/impl/Utilities.cpp
+++ b/src/ripple/validators/impl/Utilities.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 namespace ripple {
 namespace Validators {
 
diff --git a/src/ripple/validators/ripple_validators.cpp b/src/ripple/validators/ripple_validators.cpp
index 2bae7bba5..b0434240e 100644
--- a/src/ripple/validators/ripple_validators.cpp
+++ b/src/ripple/validators/ripple_validators.cpp
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #include "BeastConfig.h"
 
 #include "ripple_validators.h"
diff --git a/src/ripple/validators/ripple_validators.h b/src/ripple/validators/ripple_validators.h
index 2373e9aaa..22cf2bc61 100644
--- a/src/ripple/validators/ripple_validators.h
+++ b/src/ripple/validators/ripple_validators.h
@@ -17,7 +17,6 @@
 */
 //==============================================================================
 
-
 #ifndef RIPPLE_VALIDATORS_H_INCLUDED
 #define RIPPLE_VALIDATORS_H_INCLUDED