diff --git a/src/account.cpp b/src/account.cpp
index c83c5cdb2587e477f82ea5af429a8c7aa3e7e6b6..d00972bf5719c0353c6dfa14b0767564815c247c 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -128,6 +128,7 @@ Account* AccountPrivate::buildNewAccountFromAlias(Account::Protocol proto, const
       case Account::Protocol::RING:
          tmp = configurationManager.getAccountTemplate(DRing::Account::ProtocolNames::RING);
          break;
+      case Account::Protocol::COUNT__:
       default:
          break;
    }
diff --git a/src/accountmodel.cpp b/src/accountmodel.cpp
index c2395b4edbee7c6644df5e2866787f29a7cd6518..7103a4d5810faf930f9b6dc4d4f77404b193bf6f 100644
--- a/src/accountmodel.cpp
+++ b/src/accountmodel.cpp
@@ -51,7 +51,7 @@ AccountModel::AccountModel() : QAbstractListModel(QCoreApplication::instance())
 ,d_ptr(new AccountModelPrivate(this))
 {
    //Make sure the daemon is running as this can be called first
-   InstanceInterface& instance = DBus::InstanceManager::instance();
+   DBus::InstanceManager::instance();
 }
 
 ///Prevent constructor loop
diff --git a/src/call.cpp b/src/call.cpp
index 001b441a5c93f7b9260051d656bf98fa0664c563..fecf1372c5baa29b657a13b97d2681a8262d35cd 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -416,7 +416,7 @@ Call* Call::buildHistoryCall(const QMap<QString,QString>& hc)
    const QString& callId          = hc[ Call::HistoryMapFields::CALLID          ]          ;
    const QString& name            = hc[ Call::HistoryMapFields::DISPLAY_NAME    ]          ;
    const QString& number          = hc[ Call::HistoryMapFields::PEER_NUMBER     ]          ;
-   const QString& type            = hc[ Call::HistoryMapFields::STATE           ]          ;
+   //const QString& type            = hc[ Call::HistoryMapFields::STATE           ]          ;
    const QString& direction       = hc[ Call::HistoryMapFields::DIRECTION       ]          ;
    const QString& cert_path       = hc[ Call::HistoryMapFields::CERT_PATH       ]          ;
    const bool     missed          = hc[ Call::HistoryMapFields::MISSED          ] == "1"   ;
@@ -476,8 +476,8 @@ Call* Call::buildHistoryCall(const QMap<QString,QString>& hc)
    }
 
    //Check the certificate
-   if (!hc[Call::HistoryMapFields::CERT_PATH].isEmpty()) {
-      call->d_ptr->m_pCertificate = CertificateModel::instance()->getCertificate(QUrl(hc[Call::HistoryMapFields::CERT_PATH]),acc);
+   if (!cert_path.isEmpty()) {
+      call->d_ptr->m_pCertificate = CertificateModel::instance()->getCertificate(QUrl(cert_path),acc);
    }
 
    return call;
diff --git a/src/callmodel.cpp b/src/callmodel.cpp
index 6a2a20eb25bc22d280a0d77f87406e5dc8a7b46f..0b337e7e5b8fff25d38b3584a855ab6292cb6129 100644
--- a/src/callmodel.cpp
+++ b/src/callmodel.cpp
@@ -137,7 +137,7 @@ m_pUserActionModel(nullptr)
 CallModel::CallModel() : QAbstractItemModel(QCoreApplication::instance()),d_ptr(new CallModelPrivate(this))
 {
    //Register with the daemon
-   InstanceInterface& instance = DBus::InstanceManager::instance();
+   DBus::InstanceManager::instance();
    setObjectName("CallModel");
    #ifdef ENABLE_VIDEO
    VideoRendererManager::instance();
diff --git a/src/ringtonemodel.cpp b/src/ringtonemodel.cpp
index ab2529eb21bbb29feb0f760ddf97135bfe99da94..8c51e4b80386c89b35e257a7976897bc46a5dbf3 100644
--- a/src/ringtonemodel.cpp
+++ b/src/ringtonemodel.cpp
@@ -29,7 +29,7 @@
 RingToneModel::RingToneModel(Account* a) : QAbstractTableModel(a),m_pAccount(a),m_pTimer(nullptr),
 m_pCurrent(nullptr)
 {
-   ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
+//    ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
    QMap<QString,QString> m_hRingtonePath ;//= configurationManager.getRingtoneList();
    QMutableMapIterator<QString, QString> iter(m_hRingtonePath);
    while (iter.hasNext()) {