diff --git a/examples/MQ/1-sampler-sink/FairMQExample1Sampler.cxx b/examples/MQ/1-sampler-sink/FairMQExample1Sampler.cxx
index d73527d6..669b6d88 100644
--- a/examples/MQ/1-sampler-sink/FairMQExample1Sampler.cxx
+++ b/examples/MQ/1-sampler-sink/FairMQExample1Sampler.cxx
@@ -26,9 +26,9 @@ FairMQExample1Sampler::FairMQExample1Sampler()
 {
 }
 
-void FairMQExample1Sampler::CustomCleanup(void *data, void *object)
+void FairMQExample1Sampler::CustomCleanup(void* /*data*/, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample1Sampler::Run()
diff --git a/examples/MQ/2-sampler-processor-sink/FairMQExample2Processor.cxx b/examples/MQ/2-sampler-processor-sink/FairMQExample2Processor.cxx
index 0431bee9..95612c50 100644
--- a/examples/MQ/2-sampler-processor-sink/FairMQExample2Processor.cxx
+++ b/examples/MQ/2-sampler-processor-sink/FairMQExample2Processor.cxx
@@ -25,9 +25,9 @@ FairMQExample2Processor::FairMQExample2Processor()
 {
 }
 
-void FairMQExample2Processor::CustomCleanup(void *data, void *object)
+void FairMQExample2Processor::CustomCleanup(void* /*data*/, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample2Processor::Run()
diff --git a/examples/MQ/2-sampler-processor-sink/FairMQExample2Sampler.cxx b/examples/MQ/2-sampler-processor-sink/FairMQExample2Sampler.cxx
index 85a9a156..0ebc3822 100644
--- a/examples/MQ/2-sampler-processor-sink/FairMQExample2Sampler.cxx
+++ b/examples/MQ/2-sampler-processor-sink/FairMQExample2Sampler.cxx
@@ -25,9 +25,9 @@ FairMQExample2Sampler::FairMQExample2Sampler()
 {
 }
 
-void FairMQExample2Sampler::CustomCleanup(void *data, void *object)
+void FairMQExample2Sampler::CustomCleanup(void* /*data*/, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample2Sampler::Run()
diff --git a/examples/MQ/3-dds/FairMQExample3Processor.cxx b/examples/MQ/3-dds/FairMQExample3Processor.cxx
index f08301fc..8255fcc1 100644
--- a/examples/MQ/3-dds/FairMQExample3Processor.cxx
+++ b/examples/MQ/3-dds/FairMQExample3Processor.cxx
@@ -26,7 +26,7 @@ FairMQExample3Processor::FairMQExample3Processor()
 
 void FairMQExample3Processor::CustomCleanup(void *data, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample3Processor::Run()
diff --git a/examples/MQ/3-dds/FairMQExample3Sampler.cxx b/examples/MQ/3-dds/FairMQExample3Sampler.cxx
index ea6aa112..9fef81a0 100644
--- a/examples/MQ/3-dds/FairMQExample3Sampler.cxx
+++ b/examples/MQ/3-dds/FairMQExample3Sampler.cxx
@@ -26,7 +26,7 @@ FairMQExample3Sampler::FairMQExample3Sampler()
 
 void FairMQExample3Sampler::CustomCleanup(void *data, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample3Sampler::Run()
diff --git a/examples/MQ/3-dds/runDDSCommandUI.cxx b/examples/MQ/3-dds/runDDSCommandUI.cxx
index 1bc6e075..b5c4de1f 100644
--- a/examples/MQ/3-dds/runDDSCommandUI.cxx
+++ b/examples/MQ/3-dds/runDDSCommandUI.cxx
@@ -41,4 +41,4 @@ int main(int argc, char* argv[])
     }
 
     return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/examples/MQ/4-copypush/FairMQExample4Sampler.cxx b/examples/MQ/4-copypush/FairMQExample4Sampler.cxx
index 7632e5bf..aedf70bd 100644
--- a/examples/MQ/4-copypush/FairMQExample4Sampler.cxx
+++ b/examples/MQ/4-copypush/FairMQExample4Sampler.cxx
@@ -40,7 +40,7 @@ void FairMQExample4Sampler::Run()
 
         if (fChannels.at("data").size() > 1)
         {
-            for (int i = 1; i < fChannels.at("data").size(); ++i)
+            for (unsigned int i = 1; i < fChannels.at("data").size(); ++i)
             {
                 std::unique_ptr<FairMQMessage> msgCopy(NewMessage());
                 msgCopy->Copy(msg);
diff --git a/examples/MQ/5-req-rep/FairMQExample5Client.cxx b/examples/MQ/5-req-rep/FairMQExample5Client.cxx
index ac3947d8..f51bfa6b 100644
--- a/examples/MQ/5-req-rep/FairMQExample5Client.cxx
+++ b/examples/MQ/5-req-rep/FairMQExample5Client.cxx
@@ -29,9 +29,9 @@ FairMQExample5Client::~FairMQExample5Client()
 {
 }
 
-void FairMQExample5Client::CustomCleanup(void *data, void *hint)
+void FairMQExample5Client::CustomCleanup(void* /*data*/, void *hint)
 {
-    delete (string*)hint;
+    delete static_cast<string*>(hint);
 }
 
 void FairMQExample5Client::Run()
diff --git a/examples/MQ/5-req-rep/FairMQExample5Server.cxx b/examples/MQ/5-req-rep/FairMQExample5Server.cxx
index 9f5ea76d..9a24abc5 100644
--- a/examples/MQ/5-req-rep/FairMQExample5Server.cxx
+++ b/examples/MQ/5-req-rep/FairMQExample5Server.cxx
@@ -24,9 +24,9 @@ FairMQExample5Server::FairMQExample5Server()
 {
 }
 
-void FairMQExample5Server::CustomCleanup(void *data, void *hint)
+void FairMQExample5Server::CustomCleanup(void* /*data*/, void *hint)
 {
-    delete (string*)hint;
+    delete static_cast<string*>(hint);
 }
 
 void FairMQExample5Server::Run()
diff --git a/examples/MQ/6-multiple-channels/FairMQExample6Broadcaster.cxx b/examples/MQ/6-multiple-channels/FairMQExample6Broadcaster.cxx
index 27f026c4..e3697b25 100644
--- a/examples/MQ/6-multiple-channels/FairMQExample6Broadcaster.cxx
+++ b/examples/MQ/6-multiple-channels/FairMQExample6Broadcaster.cxx
@@ -26,9 +26,9 @@ FairMQExample6Broadcaster::FairMQExample6Broadcaster()
 {
 }
 
-void FairMQExample6Broadcaster::CustomCleanup(void *data, void *object)
+void FairMQExample6Broadcaster::CustomCleanup(void* /*data*/, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample6Broadcaster::Run()
diff --git a/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx b/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
index 5103bc0e..3e36bb7a 100644
--- a/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
+++ b/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
@@ -27,9 +27,9 @@ FairMQExample6Sampler::FairMQExample6Sampler()
 {
 }
 
-void FairMQExample6Sampler::CustomCleanup(void *data, void *object)
+void FairMQExample6Sampler::CustomCleanup(void* /*data*/, void *object)
 {
-    delete (string*)object;
+    delete static_cast<string*>(object);
 }
 
 void FairMQExample6Sampler::Run()