diff --git a/TODO b/TODO
index 343ce638..2d194ea2 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-See http://trac.atomiclabs.com/
+See http://pion.org/ticket-tracking
diff --git a/platform/include/pion/platform/ReactionEngine.hpp b/platform/include/pion/platform/ReactionEngine.hpp
index 0123312c..8a6b5878 100644
--- a/platform/include/pion/platform/ReactionEngine.hpp
+++ b/platform/include/pion/platform/ReactionEngine.hpp
@@ -125,7 +125,7 @@ class PION_PLATFORM_API ReactionEngine :
 				   DatabaseManager& database_mgr);
 	
 	/// virtual destructor
-	virtual ~ReactionEngine() { stop(); }
+	virtual ~ReactionEngine() { stop(); m_scheduler.shutdown(); }
 	
 	/// opens an existing configuration file and loads the plug-ins it contains
 	virtual void openConfigFile(void);
diff --git a/platform/server/ServiceManager.cpp b/platform/server/ServiceManager.cpp
index 766266d9..431fc4cf 100644
--- a/platform/server/ServiceManager.cpp
+++ b/platform/server/ServiceManager.cpp
@@ -61,6 +61,7 @@ ServiceManager::~ServiceManager()
 	// stop servers first
 	boost::mutex::scoped_lock services_lock(m_mutex);
 	m_servers.clear();
+	m_scheduler.shutdown();
 }
 		
 void ServiceManager::openConfigFile(void)
diff --git a/platform/tests/ReactorTests.cpp b/platform/tests/ReactorTests.cpp
index 0d7936cc..9b435497 100644
--- a/platform/tests/ReactorTests.cpp
+++ b/platform/tests/ReactorTests.cpp
@@ -358,6 +358,9 @@ BOOST_AUTO_TEST_CASE(checkDatabaseOutputReactor) {
 	// check the contents of the new database
 	//
 	
+	// first stop the data store reactor to make sure the events get flushed
+	m_reaction_engine.stopReactor(m_clickstream_id);
+	
 	// open the database
 	DatabasePtr db_ptr = m_database_mgr.getDatabase(m_embedded_db_id);
 	BOOST_REQUIRE(db_ptr);