diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h
index c501f9a8..5b5410af 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -286,7 +286,7 @@ class TerrainInfo : public Referencable<AtomicLong>
 };
 
 // class for managing TerrainData object and all sort of geometry querying operations
-class TerrainManager : public MaNGOS::Singleton<TerrainManager>, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex>
+class TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
 {
         typedef UNORDERED_MAP<uint32,  TerrainInfo*> TerrainDataMap;
         friend class MaNGOS::OperatorNew<TerrainManager>;
diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp
index 7ce34b51..0ced1369 100644
--- a/src/game/WorldHandlers/World.cpp
+++ b/src/game/WorldHandlers/World.cpp
@@ -151,12 +151,14 @@ World::~World()
     while (cliCmdQueue.next(command))
         { delete command; }
 
+    WorldSession* session = NULL;
+    while (addSessQueue.next(session))
+        { delete session; }
+
     VMAP::VMapFactory::clear();
     MMAP::MMapFactory::clear();
 
     delete m_configForceLoadMapIds;
-
-    // TODO free addSessQueue
 }
 
 /// Cleanups before world stop