diff --git a/src/FactSystem/SettingsFact.cc b/src/FactSystem/SettingsFact.cc
index d4915cd0d6591e278665b2809f3590b07e0bac23..1f673d938f421d7563a27c0733d58f34aff17891 100644
--- a/src/FactSystem/SettingsFact.cc
+++ b/src/FactSystem/SettingsFact.cc
@@ -17,7 +17,7 @@
 SettingsFact::SettingsFact(QObject* parent)
     : Fact(parent)
 {    
-
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
 }
 
 SettingsFact::SettingsFact(QString settingGroup, FactMetaData* metaData, QObject* parent)
diff --git a/src/Settings/VideoSettings.cc b/src/Settings/VideoSettings.cc
index 3b9ab513ff7376e2cec32ebe5ae8581c69d918ed..cd0228e57ce2f9688092af713226e74b8d203786 100644
--- a/src/Settings/VideoSettings.cc
+++ b/src/Settings/VideoSettings.cc
@@ -12,10 +12,10 @@
 #include <QQmlEngine>
 #include <QtQml>
 
-const char* VideoSettings::VideoSettingsGroupName = "video";
+const char* VideoSettings::videoSettingsGroupName = "video";
 
 VideoSettings::VideoSettings(QObject* parent)
-    : SettingsGroup(VideoSettingsGroupName, QString() /* root settings group */, parent)
+    : SettingsGroup(videoSettingsGroupName, QString() /* root settings group */, parent)
 {
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     qmlRegisterUncreatableType<VideoSettings>("QGroundControl.SettingsManager", 1, 0, "VideoSettings", "Reference only");
diff --git a/src/Settings/VideoSettings.h b/src/Settings/VideoSettings.h
index e5bc1117d3293afdbd207efe3e8b456b9640bf09..04bfc6bf82f310b3cc9dcf74e40b5949a1e0d3f8 100644
--- a/src/Settings/VideoSettings.h
+++ b/src/Settings/VideoSettings.h
@@ -19,7 +19,7 @@ class VideoSettings : public SettingsGroup
 public:
     VideoSettings(QObject* parent = NULL);
 
-    static const char* VideoSettingsGroupName;
+    static const char* videoSettingsGroupName;
 
 private:
 };