diff --git a/linphone-desktop/src/components/codecs/CodecsModel.cpp b/linphone-desktop/src/components/codecs/CodecsModel.cpp
index 8ae71019f..352677aba 100644
--- a/linphone-desktop/src/components/codecs/CodecsModel.cpp
+++ b/linphone-desktop/src/components/codecs/CodecsModel.cpp
@@ -89,6 +89,6 @@ QVariant CodecsModel::data (const QModelIndex &index, int role) const {
 
 void CodecsModel::enableCodec (int id, bool status) {
   Q_ASSERT(id >= 0 && id < m_codecs.count());
-  shared_ptr<linphone::PayloadType> codec = m_codecs[id].toMap().value("__codec").value<>();
+  shared_ptr<linphone::PayloadType> codec = m_codecs[id].toMap().value("__codec").value<shared_ptr<linphone::PayloadType> >();
   codec->enable(status);
 }
diff --git a/linphone-desktop/src/components/codecs/CodecsModel.hpp b/linphone-desktop/src/components/codecs/CodecsModel.hpp
index 0c0ab53de..212777ddb 100644
--- a/linphone-desktop/src/components/codecs/CodecsModel.hpp
+++ b/linphone-desktop/src/components/codecs/CodecsModel.hpp
@@ -23,10 +23,16 @@
 #ifndef CODECS_MODEL_H_
 #define CODECS_MODEL_H_
 
+#include <memory>
+
 #include <QAbstractListModel>
 
 // =============================================================================
 
+namespace linphone {
+  class PayloadType;
+}
+
 class CodecsModel : public QAbstractListModel {
   Q_OBJECT;
 
@@ -53,4 +59,6 @@ private:
   QVariantList m_codecs;
 };
 
+Q_DECLARE_METATYPE(std::shared_ptr<linphone::PayloadType> );
+
 #endif // CODECS_MODEL_H_
diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
index a8a2a2d4b..66972fed4 100644
--- a/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
+++ b/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
@@ -12,4 +12,6 @@ Text {
     bold: true
     pointSize: CodecsViewerStyle.legend.fontSize
   }
+
+  horizontalAlignment: Text.AlignHCenter
 }