diff --git a/daemon/src/dbus/networkmanager.cpp b/daemon/src/dbus/networkmanager.cpp
index 3bbc15d0043b449f4b2f62c3206beb481b8ac40c..7333066a751f69464c8ce42d8f947560b37665f1 100644
--- a/daemon/src/dbus/networkmanager.cpp
+++ b/daemon/src/dbus/networkmanager.cpp
@@ -51,7 +51,10 @@ void NetworkManager::StateChanged(const uint32_t &state)
 
 void NetworkManager::PropertiesChanged(const std::map<std::string, ::DBus::Variant> &argin0)
 {
-    WARN("Properties changed: %s", argin0.begin()->first.c_str());
+    WARN("Properties changed: ");
+    for (std::map<std::string, ::DBus::Variant>::const_iterator iter = argin0.begin();
+            iter != argin0.end(); ++iter)
+        WARN("%s", iter->first.c_str());
     Manager::instance().registerAccounts();
 }
 
diff --git a/daemon/src/sip/siptransport.cpp b/daemon/src/sip/siptransport.cpp
index 1cefb015194fbf3b236ade142b4676dcddbd599b..74385255c29f96082824a8bdea5673c829012ef0 100644
--- a/daemon/src/sip/siptransport.cpp
+++ b/daemon/src/sip/siptransport.cpp
@@ -342,10 +342,14 @@ void SipTransport::createSipTransport(SIPAccount &account)
     }
 
     if (!account.transport_) {
-        DEBUG("SipTransport: Looking into previously created transport map for %s:%d",
-                account.getLocalInterface().c_str(), account.getLocalPort());
+        std::ostringstream key;
+        key << account.getLocalInterface();
+        key << ":";
+        key << account.getLocalPort();
+        DEBUG("SipTransport: Looking into previously created transport map for"
+              " %s", key.str().c_str());
         // Could not create new transport, this transport may already exists
-        pjsip_transport *cachedTransport = transportMap_[account.getLocalPort()];
+        pjsip_transport *cachedTransport = transportMap_[key.str()];
 
         if (cachedTransport) {
             account.transport_ = cachedTransport;
@@ -436,10 +440,10 @@ SipTransport::createUdpTransport(const std::string &interface, unsigned int port
         }
     }
 
-    DEBUG("SipTransport: Listening address %s, listening port %d", listeningAddress.c_str(), listeningPort);
+    DEBUG("SipTransport: Listening address %s", fullAddressStr.c_str());
     // dump debug information to stdout
     pjsip_tpmgr_dump_transports(pjsip_endpt_get_tpmgr(endpt_));
-    transportMap_[listeningPort] = transport;
+    transportMap_[fullAddressStr] = transport;
 
     return transport;
 }
diff --git a/daemon/src/sip/siptransport.h b/daemon/src/sip/siptransport.h
index 79b874b705844ff30190454a6286b19f0bd21a87..cbbad8c7ec4997fa0dc9f287a62e33ca559575ff 100644
--- a/daemon/src/sip/siptransport.h
+++ b/daemon/src/sip/siptransport.h
@@ -169,7 +169,7 @@ class SipTransport {
          * UDP Transports are stored in this map in order to retreive them in case
          * several accounts would share the same port number.
          */
-        std::map<pj_uint16_t, pjsip_transport*> transportMap_;
+        std::map<std::string, pjsip_transport*> transportMap_;
 
         /**
          * Stun resolver array
diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
index a23725fd35c88f4cbdf61e29d1c844f0917e5d61..b76ac0942f9c4bf26d9086a6faaffb0539060963 100644
--- a/gnome/src/config/accountconfigdialog.c
+++ b/gnome/src/config/accountconfigdialog.c
@@ -534,7 +534,7 @@ static void use_sip_tls_cb(GtkWidget *widget, gpointer data)
 static gchar *
 get_interface_addr_from_name(const gchar * const iface_name)
 {
-#define	UC(b)	(((int)b)&0xff)
+#define UC(b) (((int)b)&0xff)
 
     int fd;