diff --git a/examples/MQ/3-dds/runExample3Processor.cxx b/examples/MQ/3-dds/runExample3Processor.cxx
index 44bf0808..e7f37705 100644
--- a/examples/MQ/3-dds/runExample3Processor.cxx
+++ b/examples/MQ/3-dds/runExample3Processor.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }
 
-FairMQDevicePtr getDevice(const FairMQProgOptions& config)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
     return new FairMQExample3Processor();
 }
diff --git a/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx b/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
index 9f98aa5b..fd4ca44b 100644
--- a/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
+++ b/examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
@@ -35,7 +35,7 @@ void FairMQExample6Sampler::InitTask()
 
 void FairMQExample6Sampler::Run()
 {
-    unique_ptr<FairMQPoller> poller(fTransportFactory->CreatePoller(fChannels, { "data", "broadcast" }));
+    FairMQPollerPtr poller(fTransportFactory->CreatePoller(fChannels, { "data", "broadcast" }));
 
     while (CheckCurrentState(RUNNING))
     {
diff --git a/examples/MQ/8-multipart/ex8-multipart-multiple-endpoints.json b/examples/MQ/8-multipart/ex8-multipart-multiple-endpoints.json
new file mode 100644
index 00000000..92a99032
--- /dev/null
+++ b/examples/MQ/8-multipart/ex8-multipart-multiple-endpoints.json
@@ -0,0 +1,60 @@
+{
+    "fairMQOptions": {
+        "devices": [
+            {
+                "id": "sampler1",
+                "channels": [
+                    {
+                        "name": "data-out",
+                        "sockets": [
+                            {
+                                "type": "push",
+                                "method": "connect",
+                                "address": "tcp://localhost:5555,tcp://localhost:5556",
+                                "sndBufSize": 1000,
+                                "rcvBufSize": 1000,
+                                "rateLogging": 0
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "id": "sink1",
+                "channels": [
+                    {
+                        "name": "data-in",
+                        "sockets": [
+                            {
+                                "type": "pull",
+                                "method": "bind",
+                                "address": "tcp://*:5555",
+                                "sndBufSize": 1000,
+                                "rcvBufSize": 1000,
+                                "rateLogging": 0
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                "id": "sink2",
+                "channels": [
+                    {
+                        "name": "data-in",
+                        "sockets": [
+                            {
+                                "type": "pull",
+                                "method": "connect",
+                                "address": "@tcp://*:5556",
+                                "sndBufSize": 1000,
+                                "rcvBufSize": 1000,
+                                "rateLogging": 0
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+}
diff --git a/examples/MQ/8-multipart/ex8-multipart.json b/examples/MQ/8-multipart/ex8-multipart.json
index 92a99032..2a38c2fe 100644
--- a/examples/MQ/8-multipart/ex8-multipart.json
+++ b/examples/MQ/8-multipart/ex8-multipart.json
@@ -10,7 +10,7 @@
                             {
                                 "type": "push",
                                 "method": "connect",
-                                "address": "tcp://localhost:5555,tcp://localhost:5556",
+                                "address": "tcp://localhost:5555",
                                 "sndBufSize": 1000,
                                 "rcvBufSize": 1000,
                                 "rateLogging": 0
@@ -36,24 +36,6 @@
                         ]
                     }
                 ]
-            },
-            {
-                "id": "sink2",
-                "channels": [
-                    {
-                        "name": "data-in",
-                        "sockets": [
-                            {
-                                "type": "pull",
-                                "method": "connect",
-                                "address": "@tcp://*:5556",
-                                "sndBufSize": 1000,
-                                "rcvBufSize": 1000,
-                                "rateLogging": 0
-                            }
-                        ]
-                    }
-                ]
             }
         ]
     }