diff --git a/src/blackgui/views/namevariantpairview.h b/src/blackgui/views/namevariantpairview.h
index 98d37f924..46bfe264c 100644
--- a/src/blackgui/views/namevariantpairview.h
+++ b/src/blackgui/views/namevariantpairview.h
@@ -21,8 +21,6 @@
 
 #include <QString>
 
-class QWidget;
-
 namespace BlackMisc { class CNameVariantPair; }
 namespace BlackGui
 {
diff --git a/src/blackmisc/namevariantpairlist.cpp b/src/blackmisc/namevariantpairlist.cpp
index c204a5155..ed007e4d3 100644
--- a/src/blackmisc/namevariantpairlist.cpp
+++ b/src/blackmisc/namevariantpairlist.cpp
@@ -48,7 +48,7 @@ namespace BlackMisc
     QString CNameVariantPairList::getValueAsString(const QString &name) const
     {
         if (name.isEmpty()) { return QString(); }
-        CVariant cs(getValue(name).getVariant());
+        const CVariant cs(getValue(name).getVariant());
         if (cs.isNull() || !cs.canConvert<QString>()) { return QString(); }
         return cs.value<QString>();
     }
diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h
index a5c17269d..b65c0783f 100644
--- a/src/blackmisc/namevariantpairlist.h
+++ b/src/blackmisc/namevariantpairlist.h
@@ -28,7 +28,7 @@ namespace BlackMisc
     //! \note Currently name must be unique
     class BLACKMISC_EXPORT CNameVariantPairList :
         public CSequence<CNameVariantPair>,
-        public BlackMisc::Mixin::MetaType<CNameVariantPairList>
+        public Mixin::MetaType<CNameVariantPairList>
     {
     public:
         BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CNameVariantPairList)