diff --git a/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp b/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
index 8eb2c054..2222b250 100755
--- a/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
+++ b/engine/server/library/serverDatabase/src/shared/TaskSaveSnapshot.cpp
@@ -30,9 +30,6 @@ void TaskSaveSnapshot::onComplete()
 {
 	m_snapshot->saveCompleted();
 	Persister::getInstance().saveCompleted(m_snapshot);
-
-//	delete m_snapshot;
-//	m_snapshot = nullptr;
 }
 
 // ======================================================================
diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp
index 684f559f..55d68b6f 100755
--- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp
+++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp
@@ -3235,12 +3235,10 @@ bool ServerObject::persist()
 			ServerObject *parent = static_cast<ServerObject*>(ContainerInterface::getContainedByObject(*this));
 			if (parent && !parent->isPersisted())
 			{
-				WARNING(true, ("Persisting %s into %s which is not persisted!", getNetworkId().getValueString().c_str(), parent->getNetworkId().getValueString().c_str()));
+				WARNING(true, ("Persisting %s into %s, which is not persisted!", getNetworkId().getValueString().c_str(), parent->getNetworkId().getValueString().c_str()));
 			}
 #endif
-
 			m_persisted = true;
-
 			markChildrenPersisted();
 			sendCreateAndBaselinesToDatabaseServer();
 
diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h
index 65ba2205..43595df7 100755
--- a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h
+++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedNetworkTableBuffer.h
@@ -105,6 +105,8 @@ IndexedNetworkTableBuffer<BUFFERROW,ROW,QUERY,SELECTQUERY>::~IndexedNetworkTable
 		++m_sRowsDeleted;
 		i->second=nullptr;
 	}
+
+	m_rows.clear();
 }
 
 // ----------------------------------------------------------------------