diff --git a/src/blacksim/fsx/fsxsimulatorsetup.cpp b/src/blacksim/fsx/fsxsimulatorsetup.cpp
index e53b975e5..298857d5d 100644
--- a/src/blacksim/fsx/fsxsimulatorsetup.cpp
+++ b/src/blacksim/fsx/fsxsimulatorsetup.cpp
@@ -26,7 +26,7 @@ namespace BlackSim
                     QSettings fsxRegistry("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Microsoft Games\\Flight Simulator\\10.0", QSettings::NativeFormat);
                     fsxPath = fsxRegistry.value("SetupPath").toString();
                 }
-                if (!fsxPath.isEmpty()) this->m_setup.value(CSimulatorSetup::SetupSimPath, QVariant(fsxPath));
+                if (!fsxPath.isEmpty()) this->m_setup.value(CSimulatorSetup::SetupSimPath, CVariant(fsxPath));
             }
         }
     } // namespace
diff --git a/src/blacksim/simulatorinfo.cpp b/src/blacksim/simulatorinfo.cpp
index a45d8ca00..32c3b0540 100644
--- a/src/blacksim/simulatorinfo.cpp
+++ b/src/blacksim/simulatorinfo.cpp
@@ -22,16 +22,16 @@ namespace BlackSim
     CSimulatorInfo::CSimulatorInfo() :  m_fullName("Unknown"), m_shortName("Unknown")
     {}
 
-    QVariant CSimulatorInfo::getSimulatorSetupValue(int index) const
+    CVariant CSimulatorInfo::getSimulatorSetupValue(int index) const
     {
         return this->m_simsetup.value(index);
     }
 
     QString CSimulatorInfo::getSimulatorSetupValueAsString(int index) const
     {
-        QVariant qv = getSimulatorSetupValue(index);
+        CVariant qv = getSimulatorSetupValue(index);
         Q_ASSERT(qv.canConvert<QString>());
-        return qv.toString();
+        return qv.toQString();
     }
 
     void CSimulatorInfo::setSimulatorSetup(const BlackMisc::CPropertyIndexVariantMap &setup)
diff --git a/src/blacksim/simulatorinfo.h b/src/blacksim/simulatorinfo.h
index 06320b7ef..3c0d5314f 100644
--- a/src/blacksim/simulatorinfo.h
+++ b/src/blacksim/simulatorinfo.h
@@ -29,7 +29,7 @@ namespace BlackSim
         bool isUnspecified() const { return this->m_shortName.isEmpty() || this->m_shortName.startsWith("Unspecified", Qt::CaseInsensitive); }
 
         //! Single setting value
-        QVariant getSimulatorSetupValue(int index) const;
+        BlackMisc::CVariant getSimulatorSetupValue(int index) const;
 
         //! Single setting value
         QString getSimulatorSetupValueAsString(int index) const;
@@ -86,7 +86,11 @@ namespace BlackSim
     };
 }
 
-BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::CSimulatorInfo, (o.m_fullName, o.m_shortName, o.m_simsetup))
+BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::CSimulatorInfo, (
+    o.m_fullName,
+    o.m_shortName,
+    attr(o.m_simsetup, flags<DisabledForComparison>())
+))
 Q_DECLARE_METATYPE(BlackSim::CSimulatorInfo)
 
 #endif // guard