diff --git a/BeastConfig.h b/BeastConfig.h
index 6e78266d04..1d98e6f375 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -147,6 +147,14 @@
 //#define RIPPLE_VERIFY_NODEOBJECT_KEYS 1
 #endif
 
+/** Config: RIPPLE_DUMP_LEAKS_ON_EXIT
+    Displays heap blocks and counted objects which were not disposed of
+    during exit.
+*/
+#ifndef RIPPLE_DUMP_LEAKS_ON_EXIT
+#define RIPPLE_DUMP_LEAKS_ON_EXIT 1
+#endif
+
 /** Config: RIPPLE_TRACK_MUTEXES
     Turns on a feature that enables tracking and diagnostics for mutex
     and recursive mutex objects. This affects the type of lock used
diff --git a/Notes/VFALCO_TODO.txt b/Notes/VFALCO_TODO.txt
index fbe809e974..ef1c2d06af 100644
--- a/Notes/VFALCO_TODO.txt
+++ b/Notes/VFALCO_TODO.txt
@@ -6,6 +6,7 @@ Vinnie's List: Changes day to day, descending priority
 - Full review of config docs / settings for RPC/WS
 - Fix RPCDoor to respect config setting for [rpc_secure]
 - Remove addRpcSub, findRpcSub, and notify the appropriate partner(s)
+- Make RPCHandler/Server asynchronous
 - PeerFinder collaboration with Nikolaos
 - beast::Socket integration in Ripple
 - Configuration list for Jenkins
diff --git a/modules/ripple_app/main/ripple_RippleMain.cpp b/modules/ripple_app/main/ripple_RippleMain.cpp
index d6964ed100..b83b9696ce 100644
--- a/modules/ripple_app/main/ripple_RippleMain.cpp
+++ b/modules/ripple_app/main/ripple_RippleMain.cpp
@@ -235,20 +235,19 @@ int RippleMain::run (int argc, char const* const* argv)
 
     // At exit, reports all memory blocks which have not been freed.
     //
-#if 1
-    Debug::setHeapReportLeaks (false);
-
+#if RIPPLE_DUMP_LEAKS_ON_EXIT
+    Debug::setHeapReportLeaks (true);
 #else
-    // This is some temporary leak checking test code
-    //
     Debug::setHeapReportLeaks (false);
+#endif
 
+#if 0
+    // This is some temporary leak checking test code
+    Debug::setHeapReportLeaks (false);
     //malloc (512); // Any leaks before this line in the output are from static initializations.
-
     ThreadWithCallQueue t ("test");
     GlobalPagedFreeStore::getInstance ();
     t.start ();
-
     return 0;
 #endif