diff --git a/src/accountmodel.cpp b/src/accountmodel.cpp
index 3711fd6609640b2e2937c082b6e1a78eebc1b658..8aedef0827b71b0cb15b6fca46c378181d1eab7c 100644
--- a/src/accountmodel.cpp
+++ b/src/accountmodel.cpp
@@ -64,8 +64,8 @@ void AccountModelPrivate::init()
    CallManagerInterface& callManager = DBus::CallManager::instance();
    ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
 
-   connect(&configurationManager, SIGNAL(registrationStateChanged(QString,QString, unsigned, QString)),this ,
-      SLOT(slotAccountChanged(QString,QString, unsigned, QString)));
+   connect(&configurationManager, &ConfigurationManagerInterface::registrationStateChanged,this ,
+      &AccountModelPrivate::slotDaemonAccountChanged);
    connect(&configurationManager, SIGNAL(accountsChanged())                               ,q_ptr,
       SLOT(updateAccounts())                  );
    connect(&callManager         , SIGNAL(voiceMailNotify(QString,int))                    ,this ,
@@ -208,7 +208,7 @@ Account::RegistrationState AccountModelPrivate::fromDaemonName(const QString& st
 }
 
 ///Account status changed
-void AccountModelPrivate::slotAccountChanged(const QString& account, const QString& registration_state, unsigned code, const QString& status)
+void AccountModelPrivate::slotDaemonAccountChanged(const QString& account, const QString& registration_state, unsigned code, const QString& status)
 {
    Account* a = q_ptr->getById(account.toLatin1());
 
diff --git a/src/private/accountmodel_p.h b/src/private/accountmodel_p.h
index a9cf5fe58485968a8ac9da7ae56cf8ec709a80eb..ff5ed1a3cc870c1a4076622b40f0fa5b42ddaa27 100644
--- a/src/private/accountmodel_p.h
+++ b/src/private/accountmodel_p.h
@@ -57,7 +57,7 @@ public:
    static  QHash<QByteArray,AccountPlaceHolder*> m_hsPlaceHolder;
 
 public Q_SLOTS:
-   void slotAccountChanged(const QString& account, const QString&  registration_state, unsigned code, const QString& status);
+   void slotDaemonAccountChanged(const QString& account, const QString&  registration_state, unsigned code, const QString& status);
    void slotAccountChanged(Account* a);
    void slotVoiceMailNotify( const QString& accountID , int count );
    void slotAccountPresenceEnabledChanged(bool state);
diff --git a/src/private/shmrenderer.cpp b/src/private/shmrenderer.cpp
index d35243f756d4ed02f5a605e80263bdfa0d77eaab..13e7d63af4fd02f354c79135e98e3972687a3d59 100644
--- a/src/private/shmrenderer.cpp
+++ b/src/private/shmrenderer.cpp
@@ -313,7 +313,12 @@ void Video::ShmRendererPrivate::timedEvents()
 void Video::ShmRenderer::startRendering()
 {
    QMutexLocker locker {mutex()};
-   startShm();
+
+   if (!startShm()) {
+      qDebug() << "Cannot start rendering on " << d_ptr->m_ShmPath;
+      return;
+   }
+
    if (!d_ptr->m_pTimer) {
       d_ptr->m_pTimer = new QTimer(nullptr);
 
diff --git a/src/private/videorenderermanager.cpp b/src/private/videorenderermanager.cpp
index 99c669fd8729b97323549a3f253ffb8e609e9fc0..756219765ba2271ad12f12c435eec4f49d92ea10 100644
--- a/src/private/videorenderermanager.cpp
+++ b/src/private/videorenderermanager.cpp
@@ -80,8 +80,8 @@ VideoRendererManager::VideoRendererManager():QThread(), d_ptr(new VideoRendererM
 {
    VideoManagerInterface& interface = DBus::VideoManager::instance();
    connect( &interface , SIGNAL(deviceEvent())                           , d_ptr.data(), SLOT(deviceEvent())                           );
-   connect( &interface , SIGNAL(startedDecoding(QString,QString,int,int,bool)), d_ptr.data(), SLOT(startedDecoding(QString,QString,int,int)));
-   connect( &interface , SIGNAL(stoppedDecoding(QString,QString,bool))        , d_ptr.data(), SLOT(stoppedDecoding(QString,QString))        );
+   connect( &interface , &VideoManagerInterface::startedDecoding, d_ptr.data(), &VideoRendererManagerPrivate::startedDecoding);
+   connect( &interface , &VideoManagerInterface::stoppedDecoding, d_ptr.data(), &VideoRendererManagerPrivate::stoppedDecoding);
 }
 
 
diff --git a/xml/callmanager-introspec.xml b/xml/callmanager-introspec.xml
index 0e67423012d73ebc2bf9ec42a35d94ffc68f5662..912b2c3da42711f9afbb731ee6b668d63e78b795 100644
--- a/xml/callmanager-introspec.xml
+++ b/xml/callmanager-introspec.xml
@@ -792,5 +792,12 @@
             </tp:docstring>
             </arg>
         </signal>
+
+        <signal name="peerHold" tp:name-for-bindings="peerHold">
+            <tp:added version="2.0.0"/>
+            <arg type="s" name="callID" />
+            <arg type="b" name="peerHolding" />
+        </signal>
+
     </interface>
 </node>
diff --git a/xml/configurationmanager-introspec.xml b/xml/configurationmanager-introspec.xml
index a78f2a20fbba13c610c1faa478e5d83334d29abe..80384a45df7aaf5c03520daf908a0a44a848be62 100644
--- a/xml/configurationmanager-introspec.xml
+++ b/xml/configurationmanager-introspec.xml
@@ -532,7 +532,7 @@
 
        <signal name="registrationStateChanged" tp:name-for-bindings="registrationStateChanged">
            <arg type="s" name="accountID"/>
-           <arg type="i" name="registrationState"/>
+           <arg type="s" name="registrationState"/>
            <arg type="i" name="registrationDetail">
                <tp:docstring>
                    The optional account-type specific message code. 0 when not available.