diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx
index 15a69613..ca05c971 100644
--- a/fairmq/FairMQChannel.cxx
+++ b/fairmq/FairMQChannel.cxx
@@ -65,7 +65,7 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str
 {
 }
 
-FairMQChannel::FairMQChannel(const string& name, const string& type, std::shared_ptr<FairMQTransportFactory> factory)
+FairMQChannel::FairMQChannel(const string& name, const string& type, shared_ptr<FairMQTransportFactory> factory)
     : fSocket(factory->CreateSocket(type, name))
     , fType(type)
     , fMethod("unspecified")
diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index eff2f84d..67b20ba5 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -302,7 +302,7 @@ bool FairMQDevice::AttachChannel(FairMQChannel& ch)
         ch.fSocket->SetOption("snd-hwm", &(ch.fSndBufSize), sizeof(ch.fSndBufSize));
         ch.fSocket->SetOption("rcv-hwm", &(ch.fRcvBufSize), sizeof(ch.fRcvBufSize));
 
-        // set kernel transmit size
+        // set kernel transmit size (set it only if value is not the default value)
         if (ch.fSndKernelSize != 0)
         {
             ch.fSocket->SetOption("snd-size", &(ch.fSndKernelSize), sizeof(ch.fSndKernelSize));
diff --git a/fairmq/nanomsg/FairMQMessageNN.h b/fairmq/nanomsg/FairMQMessageNN.h
index 6c5ed4fd..42891735 100644
--- a/fairmq/nanomsg/FairMQMessageNN.h
+++ b/fairmq/nanomsg/FairMQMessageNN.h
@@ -24,7 +24,7 @@
 
 class FairMQSocketNN;
 
-class FairMQMessageNN : public FairMQMessage
+class FairMQMessageNN final : public FairMQMessage
 {
     friend class FairMQSocketNN;
 
diff --git a/fairmq/nanomsg/FairMQPollerNN.h b/fairmq/nanomsg/FairMQPollerNN.h
index 7d5ec5eb..d8d0d895 100644
--- a/fairmq/nanomsg/FairMQPollerNN.h
+++ b/fairmq/nanomsg/FairMQPollerNN.h
@@ -26,7 +26,7 @@
 class FairMQChannel;
 struct nn_pollfd;
 
-class FairMQPollerNN : public FairMQPoller
+class FairMQPollerNN final : public FairMQPoller
 {
     friend class FairMQChannel;
     friend class FairMQTransportFactoryNN;
@@ -41,13 +41,13 @@ class FairMQPollerNN : public FairMQPoller
 
     void SetItemEvents(nn_pollfd& item, const int type);
 
-    virtual void Poll(const int timeout);
-    virtual bool CheckInput(const int index);
-    virtual bool CheckOutput(const int index);
-    virtual bool CheckInput(const std::string& channelKey, const int index);
-    virtual bool CheckOutput(const std::string& channelKey, const int index);
+    void Poll(const int timeout) override;
+    bool CheckInput(const int index) override;
+    bool CheckOutput(const int index) override;
+    bool CheckInput(const std::string& channelKey, const int index) override;
+    bool CheckOutput(const std::string& channelKey, const int index) override;
 
-    virtual ~FairMQPollerNN();
+    ~FairMQPollerNN() override;
 
   private:
     FairMQPollerNN(const FairMQSocket& cmdSocket, const FairMQSocket& dataSocket);
diff --git a/fairmq/nanomsg/FairMQSocketNN.h b/fairmq/nanomsg/FairMQSocketNN.h
index e27662e0..00dea137 100644
--- a/fairmq/nanomsg/FairMQSocketNN.h
+++ b/fairmq/nanomsg/FairMQSocketNN.h
@@ -17,7 +17,7 @@
 
 class FairMQTransportFactoryNN;
 
-class FairMQSocketNN : public FairMQSocket
+class FairMQSocketNN final : public FairMQSocket
 {
     friend class FairMQTransportFactoryNN;
 
diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.h b/fairmq/nanomsg/FairMQTransportFactoryNN.h
index 09afdf9b..850018dd 100644
--- a/fairmq/nanomsg/FairMQTransportFactoryNN.h
+++ b/fairmq/nanomsg/FairMQTransportFactoryNN.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <string>
 
-class FairMQTransportFactoryNN : public FairMQTransportFactory
+class FairMQTransportFactoryNN final : public FairMQTransportFactory
 {
   public:
     FairMQTransportFactoryNN(const std::string& id = "", const FairMQProgOptions* config = nullptr);
diff --git a/fairmq/nanomsg/FairMQUnmanagedRegionNN.h b/fairmq/nanomsg/FairMQUnmanagedRegionNN.h
index 6f758fb2..bcb7de4d 100644
--- a/fairmq/nanomsg/FairMQUnmanagedRegionNN.h
+++ b/fairmq/nanomsg/FairMQUnmanagedRegionNN.h
@@ -13,7 +13,7 @@
 
 #include <cstddef> // size_t
 
-class FairMQUnmanagedRegionNN : public FairMQUnmanagedRegion
+class FairMQUnmanagedRegionNN final : public FairMQUnmanagedRegion
 {
     friend class FairMQSocketNN;
 
diff --git a/fairmq/ofi/Message.h b/fairmq/ofi/Message.h
index 8586043f..17289160 100644
--- a/fairmq/ofi/Message.h
+++ b/fairmq/ofi/Message.h
@@ -30,7 +30,7 @@ namespace ofi
  *
  * @todo TODO insert long description
  */
-class Message : public fair::mq::Message
+class Message final : public fair::mq::Message
 {
   public:
     Message();
diff --git a/fairmq/ofi/Poller.h b/fairmq/ofi/Poller.h
index 9409953b..9059483b 100644
--- a/fairmq/ofi/Poller.h
+++ b/fairmq/ofi/Poller.h
@@ -33,7 +33,7 @@ class TransportFactory;
  *
  * @todo TODO insert long description
  */
-class Poller : public FairMQPoller
+class Poller final : public FairMQPoller
 {
     friend class FairMQChannel;
     friend class TransportFactory;
diff --git a/fairmq/ofi/Socket.h b/fairmq/ofi/Socket.h
index 3952a506..34988352 100644
--- a/fairmq/ofi/Socket.h
+++ b/fairmq/ofi/Socket.h
@@ -32,7 +32,7 @@ namespace ofi
  *
  * @todo TODO insert long description
  */
-class Socket : public fair::mq::Socket
+class Socket final : public fair::mq::Socket
 {
   public:
     Socket(Context& factory, const std::string& type, const std::string& name, const std::string& id = "");
diff --git a/fairmq/ofi/TransportFactory.h b/fairmq/ofi/TransportFactory.h
index 9c43eb88..df6a8d6a 100644
--- a/fairmq/ofi/TransportFactory.h
+++ b/fairmq/ofi/TransportFactory.h
@@ -26,7 +26,7 @@ namespace ofi
  *
  * @todo TODO insert long description
  */
-class TransportFactory : public FairMQTransportFactory
+class TransportFactory final : public FairMQTransportFactory
 {
   public:
     TransportFactory(const std::string& id = "", const FairMQProgOptions* config = nullptr);
diff --git a/fairmq/shmem/FairMQMessageSHM.h b/fairmq/shmem/FairMQMessageSHM.h
index 07904e8b..a9f2dabd 100644
--- a/fairmq/shmem/FairMQMessageSHM.h
+++ b/fairmq/shmem/FairMQMessageSHM.h
@@ -22,7 +22,7 @@
 
 class FairMQSocketSHM;
 
-class FairMQMessageSHM : public FairMQMessage
+class FairMQMessageSHM final : public FairMQMessage
 {
     friend class FairMQSocketSHM;
 
diff --git a/fairmq/shmem/FairMQPollerSHM.h b/fairmq/shmem/FairMQPollerSHM.h
index 7dbdb686..8f7cbeae 100644
--- a/fairmq/shmem/FairMQPollerSHM.h
+++ b/fairmq/shmem/FairMQPollerSHM.h
@@ -19,7 +19,7 @@
 
 class FairMQChannel;
 
-class FairMQPollerSHM : public FairMQPoller
+class FairMQPollerSHM final : public FairMQPoller
 {
     friend class FairMQChannel;
     friend class FairMQTransportFactorySHM;
diff --git a/fairmq/shmem/FairMQSocketSHM.h b/fairmq/shmem/FairMQSocketSHM.h
index 68742cda..c2c2b406 100644
--- a/fairmq/shmem/FairMQSocketSHM.h
+++ b/fairmq/shmem/FairMQSocketSHM.h
@@ -16,7 +16,7 @@
 #include <atomic>
 #include <memory> // unique_ptr
 
-class FairMQSocketSHM : public FairMQSocket
+class FairMQSocketSHM final : public FairMQSocket
 {
   public:
     FairMQSocketSHM(fair::mq::shmem::Manager& manager, const std::string& type, const std::string& name, const std::string& id = "", void* context = nullptr);
diff --git a/fairmq/shmem/FairMQTransportFactorySHM.h b/fairmq/shmem/FairMQTransportFactorySHM.h
index ffc47ed1..dc4e9500 100644
--- a/fairmq/shmem/FairMQTransportFactorySHM.h
+++ b/fairmq/shmem/FairMQTransportFactorySHM.h
@@ -26,7 +26,7 @@
 #include <thread>
 #include <atomic>
 
-class FairMQTransportFactorySHM : public FairMQTransportFactory
+class FairMQTransportFactorySHM final : public FairMQTransportFactory
 {
   public:
     FairMQTransportFactorySHM(const std::string& id = "", const FairMQProgOptions* config = nullptr);
diff --git a/fairmq/shmem/FairMQUnmanagedRegionSHM.h b/fairmq/shmem/FairMQUnmanagedRegionSHM.h
index 89591faf..d0629046 100644
--- a/fairmq/shmem/FairMQUnmanagedRegionSHM.h
+++ b/fairmq/shmem/FairMQUnmanagedRegionSHM.h
@@ -19,7 +19,7 @@
 
 #include <cstddef> // size_t
 
-class FairMQUnmanagedRegionSHM : public FairMQUnmanagedRegion
+class FairMQUnmanagedRegionSHM final : public FairMQUnmanagedRegion
 {
     friend class FairMQSocketSHM;
     friend class FairMQMessageSHM;
diff --git a/fairmq/zeromq/FairMQMessageZMQ.h b/fairmq/zeromq/FairMQMessageZMQ.h
index 24bcb29e..c2f4b64e 100644
--- a/fairmq/zeromq/FairMQMessageZMQ.h
+++ b/fairmq/zeromq/FairMQMessageZMQ.h
@@ -26,7 +26,7 @@
 
 class FairMQSocketZMQ;
 
-class FairMQMessageZMQ : public FairMQMessage
+class FairMQMessageZMQ final : public FairMQMessage
 {
     friend class FairMQSocketZMQ;
 
diff --git a/fairmq/zeromq/FairMQPollerZMQ.h b/fairmq/zeromq/FairMQPollerZMQ.h
index 594a43e3..f416c109 100644
--- a/fairmq/zeromq/FairMQPollerZMQ.h
+++ b/fairmq/zeromq/FairMQPollerZMQ.h
@@ -27,7 +27,7 @@
 
 class FairMQChannel;
 
-class FairMQPollerZMQ : public FairMQPoller
+class FairMQPollerZMQ final : public FairMQPoller
 {
     friend class FairMQChannel;
     friend class FairMQTransportFactoryZMQ;
@@ -42,13 +42,13 @@ class FairMQPollerZMQ : public FairMQPoller
 
     void SetItemEvents(zmq_pollitem_t& item, const int type);
 
-    virtual void Poll(const int timeout);
-    virtual bool CheckInput(const int index);
-    virtual bool CheckOutput(const int index);
-    virtual bool CheckInput(const std::string& channelKey, const int index);
-    virtual bool CheckOutput(const std::string& channelKey, const int index);
+    void Poll(const int timeout) override;
+    bool CheckInput(const int index) override;
+    bool CheckOutput(const int index) override;
+    bool CheckInput(const std::string& channelKey, const int index) override;
+    bool CheckOutput(const std::string& channelKey, const int index) override;
 
-    virtual ~FairMQPollerZMQ();
+    ~FairMQPollerZMQ() override;
 
   private:
     FairMQPollerZMQ(const FairMQSocket& cmdSocket, const FairMQSocket& dataSocket);
diff --git a/fairmq/zeromq/FairMQSocketZMQ.h b/fairmq/zeromq/FairMQSocketZMQ.h
index 0a1be10c..e8b3dd79 100644
--- a/fairmq/zeromq/FairMQSocketZMQ.h
+++ b/fairmq/zeromq/FairMQSocketZMQ.h
@@ -16,7 +16,7 @@
 #include "FairMQSocket.h"
 #include "FairMQMessage.h"
 
-class FairMQSocketZMQ : public FairMQSocket
+class FairMQSocketZMQ final : public FairMQSocket
 {
   public:
     FairMQSocketZMQ(const std::string& type, const std::string& name, const std::string& id = "", void* context = nullptr);
diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.h b/fairmq/zeromq/FairMQTransportFactoryZMQ.h
index 6e156aae..a8d94cff 100644
--- a/fairmq/zeromq/FairMQTransportFactoryZMQ.h
+++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.h
@@ -25,7 +25,7 @@
 #include "FairMQUnmanagedRegionZMQ.h"
 #include <options/FairMQProgOptions.h>
 
-class FairMQTransportFactoryZMQ : public FairMQTransportFactory
+class FairMQTransportFactoryZMQ final : public FairMQTransportFactory
 {
   public:
     FairMQTransportFactoryZMQ(const std::string& id = "", const FairMQProgOptions* config = nullptr);
diff --git a/fairmq/zeromq/FairMQUnmanagedRegionZMQ.h b/fairmq/zeromq/FairMQUnmanagedRegionZMQ.h
index c05f05e2..a92cc2a3 100644
--- a/fairmq/zeromq/FairMQUnmanagedRegionZMQ.h
+++ b/fairmq/zeromq/FairMQUnmanagedRegionZMQ.h
@@ -13,7 +13,7 @@
 
 #include <cstddef> // size_t
 
-class FairMQUnmanagedRegionZMQ : public FairMQUnmanagedRegion
+class FairMQUnmanagedRegionZMQ final : public FairMQUnmanagedRegion
 {
     friend class FairMQSocketZMQ;
     friend class FairMQMessageZMQ;