diff --git a/src/DataExporter.cpp b/src/DataExporter.cpp
index 8dde8fcbcc12390f3a3a1397f58723ff8f3b1d7f..6d43dfaceebc965aea53592ead22663b6a5880a1 100644
--- a/src/DataExporter.cpp
+++ b/src/DataExporter.cpp
@@ -481,7 +481,7 @@ void DataExporter::get_device_property()
 //--------------------------------------------------------
 void DataExporter::always_executed_hook()
 {
-	INFO_STREAM << "DataExporter::always_executed_hook()  " << device_name << endl;
+	DEBUG_STREAM << "DataExporter::always_executed_hook()  " << device_name << endl;
 	/*----- PROTECTED REGION ID(DataExporter::always_executed_hook) ENABLED START -----*/
 
     if(get_state() != Tango::FAULT)
diff --git a/src/DataExporter.xmi b/src/DataExporter.xmi
index 46378fb640e023cf27a0938b2f53f46c9997abfd..a90172e0c5c4bb78fdd20505476744dbb517ffc2 100644
--- a/src/DataExporter.xmi
+++ b/src/DataExporter.xmi
@@ -136,10 +136,10 @@
     <states name="OFF" description="Data exporter is in OFF state (not ready for incoming connections)">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
-    <states name="FAULT" description="Data exporter is in FAULT state (not ready to propagate data)">
+    <states name="FAULT" description="Data exporter is in FAULT state (configuration error)">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
-    <states name="ALARM" description="Data exporter is in ALARM state (not ready to propagate data)">
+    <states name="ALARM" description="Data exporter is in ALARM state (runtime error)">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
     <preferences docHome="./doc_html" makefileHome="/usr/local/tango-8.1.2/share/pogo/preferences"/>
diff --git a/src/DataExporterStateMachine.cpp b/src/DataExporterStateMachine.cpp
index 8d089b36de15e2f4b346cce312c74c716e009408..2f5b33480de926e010f0fb4ee04380fe2cb851fc 100644
--- a/src/DataExporterStateMachine.cpp
+++ b/src/DataExporterStateMachine.cpp
@@ -43,8 +43,8 @@
 //================================================================
 //  ON      |  Data exporter is in ON state (ready to incoming connections)
 //  OFF     |  Data exporter is in OFF state (not ready for incoming connections)
-//  FAULT   |  Data exporter is in FAULT state (not ready to propagate data)
-//  ALARM   |  Data exporter is in ALARM state (not ready to propagate data)
+//  FAULT   |  Data exporter is in FAULT state (configuration error)
+//  ALARM   |  Data exporter is in ALARM state (runtime error)
 
 
 namespace DataExporter_ns
diff --git a/src/Server.cpp b/src/Server.cpp
index 2e87b4051d0e720f9332227d3d8936f0b28a5c8c..ddeabef20bebc1bdc5163301615cf25b94a120cc 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -30,7 +30,7 @@ Server::Server(Tango::DeviceImpl* deviceImpl_p, Configuration::SP configuration_
 }
 
 //==============================================================================
-//      Server::Server()
+//      Server::~Server()
 //==============================================================================
 Server::~Server()
 {
@@ -45,11 +45,13 @@ Server::~Server()
 
     if(m_threadGroup_sp)
     {
-        m_threadGroup_sp->interrupt_all();
+        //m_threadGroup_sp->interrupt_all();
 
         m_threadGroup_sp->join_all();
     }
 
+    DEBUG_STREAM << "Server::~Server() END" << endl;
+
     google::protobuf::ShutdownProtobufLibrary();
 }
 
@@ -119,7 +121,7 @@ void Server::stop() throw(std::runtime_error)
 
     if(m_threadGroup_sp)
     {
-        m_threadGroup_sp->interrupt_all();
+        //m_threadGroup_sp->interrupt_all();
 
         m_threadGroup_sp->join_all();
     }
@@ -196,4 +198,4 @@ void Server::handleAccept(Session::SP session_sp,
     startAccept();
 }
 
-}   //namespace
\ No newline at end of file
+}   //namespace