diff --git a/daemon/src/upnp/upnp.cpp b/daemon/src/upnp/upnp.cpp
index 70e246e4923b0eb8954a4c35a09cb39539285be4..f7ec85518d772e1a2f6d79c88dffec201b702301 100644
--- a/daemon/src/upnp/upnp.cpp
+++ b/daemon/src/upnp/upnp.cpp
@@ -133,9 +133,9 @@ bool operator!= (Mapping &cMap1, Mapping &cMap2)
 }
 
 Controller::Controller()
-    : udpGlobalMappings_(getGlobalInstance<UDPMapGlobal>())
+    : defaultIGD_(getIGD())
+    , udpGlobalMappings_(getGlobalInstance<UDPMapGlobal>())
     , tcpGlobalMappings_(getGlobalInstance<TCPMapGlobal>())
-    , defaultIGD_(getIGD())
 {}
 
 Controller::~Controller()
diff --git a/daemon/src/upnp/upnp.h b/daemon/src/upnp/upnp.h
index dfd9d9259dcff5fa6e6d1f877b1450e36318ac93..ca6ace1b7eeb6713dce594279c4976800064711b 100644
--- a/daemon/src/upnp/upnp.h
+++ b/daemon/src/upnp/upnp.h
@@ -117,7 +117,7 @@ public:
     {};
 
     /* move constructor and operator */
-    Mapping(Mapping&& other) = default;
+    Mapping(Mapping&&) = default;
     Mapping& operator=(Mapping&&) = default;
 
     friend bool operator== (Mapping &cRedir1, Mapping &cRedir2);
@@ -250,4 +250,4 @@ std::shared_ptr<IGD> getIGD();
 
 }} // namespace ring::upnp
 
-#endif /* UPNP_H_ */
\ No newline at end of file
+#endif /* UPNP_H_ */