diff --git a/pom.xml b/pom.xml
index f4f2bdc4273f74a7baa2b3a6837ce6ad734e2cc5..23313fdeef485004a09aeb0afa629e887fc2b190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
    
    <groupId>fr.soleil.device</groupId>
    <artifactId>PulseCounting-${aol}-${mode}</artifactId>
-   <version>1.6.1-SNAPSHOT</version>
+   <version>1.6.1</version>
    
    <packaging>nar</packaging>
    <name>PulseCounting</name>
@@ -43,6 +43,7 @@
        <dependency>
            <groupId>fr.soleil.lib</groupId>
            <artifactId>NI660Xsl-${aol}-${library}-${mode}</artifactId>
+		   <version>1.5.0</version>
        </dependency>
             <dependency>
                 <groupId>fr.soleil.lib</groupId>
diff --git a/src/BufferedCounterPeriod.h b/src/BufferedCounterPeriod.h
index 2056efaac110ea1c950e652b5310560d5f433e8f..cebf30ea99996b825b5a4721cd7744ce2c363c6d 100644
--- a/src/BufferedCounterPeriod.h
+++ b/src/BufferedCounterPeriod.h
@@ -184,7 +184,7 @@ protected:
   bool m_cntTimedout;
 
   // Storage error flag
-  bool m_storageError; // soso crash rock
+  bool m_storageError;
 
   // storage manager
   NexusManager * m_storage_mgr;
diff --git a/src/NI6602_Interface.cpp b/src/NI6602_Interface.cpp
index 07437f5ab0e7f25986bf3b801f266f00c430794c..929ec9d2d588686768247fb7dba8967ee3abe701 100644
--- a/src/NI6602_Interface.cpp
+++ b/src/NI6602_Interface.cpp
@@ -1463,7 +1463,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
 
   bool l_overrun = false;
   bool l_timedout = false;
-  bool l_storageErr = false; // soso crash rock
+  bool l_storageErr = false;
 
 
 	switch (m_acq_mode)
@@ -1563,7 +1563,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
             // get buffering errors (overrun, timeout or storage error)
             l_overrun = m_buffer_pos_ct_list[p_cfg.name]->isOverrun();
             l_timedout = m_buffer_pos_ct_list[p_cfg.name]->isTimedout();
-            l_storageErr = m_buffer_pos_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+            l_storageErr = m_buffer_pos_ct_list[p_cfg.name]->isStorageKO();
           }
           else
           {
@@ -1587,7 +1587,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
             // get buffering errors (overrun, timeout or storage error)
             l_overrun = m_buffer_evt_ct_list[p_cfg.name]->isOverrun();
             l_timedout = m_buffer_evt_ct_list[p_cfg.name]->isTimedout();
-            l_storageErr = m_buffer_evt_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+            l_storageErr = m_buffer_evt_ct_list[p_cfg.name]->isStorageKO();
           }
           else
           {
@@ -1610,7 +1610,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
             // get buffering errors (overrun, timeout or storage error)
             l_overrun = m_buffer_dt_ct_list[p_cfg.name]->isOverrun();
             l_timedout = m_buffer_dt_ct_list[p_cfg.name]->isTimedout();
-            l_storageErr = m_buffer_dt_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+            l_storageErr = m_buffer_dt_ct_list[p_cfg.name]->isStorageKO();
           }
           else
           {
@@ -1633,7 +1633,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
             // get buffering errors (overrun, timeout or storage error)
             l_overrun = m_buffer_prd_ct_list[p_cfg.name]->isOverrun();
             l_timedout = m_buffer_prd_ct_list[p_cfg.name]->isTimedout();
-            l_storageErr = m_buffer_prd_ct_list[p_cfg.name]->isStorageKO(); // soso crash rock
+            l_storageErr = m_buffer_prd_ct_list[p_cfg.name]->isStorageKO();
           }
           else
           {
@@ -1685,7 +1685,7 @@ Tango::DevState NI6602_Interface::getCounterState(CounterConfig p_cfg)
   if (l_timedout)
     l_val = Tango::DISABLE;
 
-  if (l_storageErr) // soso crash rock
+  if (l_storageErr)
     l_val = Tango::FAULT;
 
 	return l_val;
diff --git a/src/NexusManager.cpp b/src/NexusManager.cpp
index f57a1f78917b8c3e0e5c4470381808aeee40e62e..0f14acbb2ae761ff1b14639a7af1101c282f763b 100644
--- a/src/NexusManager.cpp
+++ b/src/NexusManager.cpp
@@ -80,6 +80,9 @@ NexusManager::~NexusManager ()
   {
     if (this->m_NexusDataStreamerFinalizer)
       this->m_NexusDataStreamerFinalizer->stop();
+
+      delete m_NexusDataStreamerFinalizer;
+      m_NexusDataStreamerFinalizer = NULL;
   }
   catch (...)
   {
diff --git a/src/PulseCountingManager.cpp b/src/PulseCountingManager.cpp
index 29e9bf077eca8621a7f6fbc4410a7abb825d19a7..b8554dc96c9b575661886390b94e9b47c4c83ca0 100644
--- a/src/PulseCountingManager.cpp
+++ b/src/PulseCountingManager.cpp
@@ -125,6 +125,18 @@ PulseCountingManager::~PulseCountingManager ()
       l_it->second = NULL;
     }
   }
+
+  if (m_nexus_manager)
+  {
+    delete m_nexus_manager;
+    m_nexus_manager = NULL;
+  }
+
+  if (m_dyn_attr_manager)
+  {
+    delete m_dyn_attr_manager;
+    m_dyn_attr_manager = NULL;
+  }
 }
 
 // ============================================================================