diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index 5786a4c3..20909f98 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -144,6 +144,7 @@ Set(FAIRMQHEADERS
   devices/BaseSourcePolicy.h
   options/FairProgOptionsHelper.h
   tools/FairMQTools.h
+  tools/runSimpleMQStateMachine.h
 )
 Install(FILES ${FAIRMQHEADERS} DESTINATION include)
 
diff --git a/fairmq/devices/GenericProcessor.h b/fairmq/devices/GenericProcessor.h
index aab94d32..1ee97aeb 100644
--- a/fairmq/devices/GenericProcessor.h
+++ b/fairmq/devices/GenericProcessor.h
@@ -131,10 +131,9 @@ class GenericProcessor : public FairMQDevice, public T, public U, public V
         {
             std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
 
-            ++receivedMsgs;
-
             if (inputChannel.Receive(msg) > 0)
             {
+                receivedMsgs++;
                 // deserialization_type::DeserializeMsg(msg) --> deserialize data of msg and fill output container
                 // proc_task_type::ExecuteTask( ... )   --> process output container
                 proc_task_type::ExecuteTask(deserialization_type::DeserializeMsg(msg.get()));
diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h
index 712fd706..27f69f6b 100644
--- a/fairmq/tools/runSimpleMQStateMachine.h
+++ b/fairmq/tools/runSimpleMQStateMachine.h
@@ -18,9 +18,9 @@
 
 /// ZMQ/nmsg (in FairSoft)
 #ifdef NANOMSG
-#include "nanomsg/FairMQTransportFactoryNN.h"
+#include "FairMQTransportFactoryNN.h"
 #else
-#include "zeromq/FairMQTransportFactoryZMQ.h"
+#include "FairMQTransportFactoryZMQ.h"
 #endif
 
 /// FairRoot - FairMQ