diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index 85720706..869f0bec 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -795,7 +795,7 @@ shared_ptr<FairMQTransportFactory> FairMQDevice::AddTransport(const string& tran
 
         FairMQMessagePtr msg(tr->CreateMessage());
 
-        return move(tr);
+        return tr;
     }
     else
     {
@@ -834,7 +834,7 @@ unique_ptr<FairMQTransportFactory> FairMQDevice::MakeTransport(const string& tra
         return tr;
     }
 
-    return move(tr);
+    return tr;
 }
 
 void FairMQDevice::CreateOwnConfig()
diff --git a/fairmq/options/FairMQProgOptions.h b/fairmq/options/FairMQProgOptions.h
index 7edd831e..092dcedd 100644
--- a/fairmq/options/FairMQProgOptions.h
+++ b/fairmq/options/FairMQProgOptions.h
@@ -84,19 +84,6 @@ class FairMQProgOptions : public FairProgOptions
     // - if UpdateChannelMap(const FairMQMap& map) method is called
     // - if UserParser template method is called (it is called in the ParseAll method if json or xml MQ-config files is provided)
 
-    // specialization/overloading for string, pass by const ref
-    int UpdateValue(const std::string& key, const std::string& val) // string API
-    {
-        UpdateValue(key, val);
-        return 0;
-    }
-
-    int UpdateValue(const std::string& key, const char* val) // string API
-    {
-        UpdateValue<std::string>(key, std::string(val));
-        return 0;
-    }
-
     template<typename T>
     int UpdateValue(const std::string& key, T val)
     {
diff --git a/fairmq/plugins/DDS/DDS.cxx b/fairmq/plugins/DDS/DDS.cxx
index 1896b6f0..3827eb0e 100644
--- a/fairmq/plugins/DDS/DDS.cxx
+++ b/fairmq/plugins/DDS/DDS.cxx
@@ -38,8 +38,8 @@ DDS::DDS(const string name, const Plugin::Version version, const string maintain
     , fNewEvent()
     , fDeviceTerminationRequested(false)
     , fIosWork{fIos}
-    , fHeartbeatInterval{100}
     , fHeartbeatTimer{fIos, fHeartbeatInterval}
+    , fHeartbeatInterval{100}
 {
     try
     {
@@ -279,7 +279,7 @@ auto DDS::SubscribeForCustomCommands() -> void
         else if (cmd == "subscribe-to-heartbeats")
         {
             {
-                auto size = fHeartbeatSubscribers.size();
+                // auto size = fHeartbeatSubscribers.size();
                 std::lock_guard<std::mutex> lock{fHeartbeatSubscriberMutex};
                 fHeartbeatSubscribers.insert(senderId);
             }
@@ -296,7 +296,7 @@ auto DDS::SubscribeForCustomCommands() -> void
         else if (cmd == "subscribe-to-state-changes")
         {
             {
-                auto size = fStateChangeSubscribers.size();
+                // auto size = fStateChangeSubscribers.size();
                 std::lock_guard<std::mutex> lock{fStateChangeSubscriberMutex};
                 fStateChangeSubscribers.insert(senderId);
             }
diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx
index dad365a5..cec0bf30 100644
--- a/fairmq/shmem/FairMQTransportFactorySHM.cxx
+++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx
@@ -37,7 +37,6 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai
     : FairMQTransportFactory(id)
     , fSessionName("default")
     , fContext(nullptr)
-    , fHeartbeatSocket(nullptr)
     , fHeartbeatThread()
     , fSendHeartbeats(true)
     , fShMutex(nullptr)
diff --git a/fairmq/shmem/FairMQTransportFactorySHM.h b/fairmq/shmem/FairMQTransportFactorySHM.h
index 83b85eab..b36cc319 100644
--- a/fairmq/shmem/FairMQTransportFactorySHM.h
+++ b/fairmq/shmem/FairMQTransportFactorySHM.h
@@ -58,7 +58,6 @@ class FairMQTransportFactorySHM : public FairMQTransportFactory
     static FairMQ::Transport fTransportType;
     std::string fSessionName;
     void* fContext;
-    void* fHeartbeatSocket;
     std::thread fHeartbeatThread;
     std::atomic<bool> fSendHeartbeats;
     std::unique_ptr<boost::interprocess::named_mutex> fShMutex;
diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h
index 6349aef7..cd4101ad 100644
--- a/fairmq/shmem/Manager.h
+++ b/fairmq/shmem/Manager.h
@@ -37,7 +37,7 @@ namespace shmem
 
 class Manager
 {
-    friend class Region;
+    friend struct Region;
 
   public:
     Manager(const std::string& name, size_t size);