diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index 4acafa1cf..a8bcf8f4a 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -172,3 +172,6 @@ CLog::~CLog()
     log( m_msg.toUtf8().data(), m_debugLevel );
 }
 
+Logger::CDebug::~CDebug()
+{
+}
diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h
index 466ba7be5..8ab6b8515 100644
--- a/src/libcalamares/utils/Logger.h
+++ b/src/libcalamares/utils/Logger.h
@@ -48,6 +48,7 @@ namespace Logger
         CDebug( unsigned int debugLevel = LOGDEBUG ) : CLog( debugLevel )
         {
         }
+        virtual ~CDebug();
     };
 
     DLLEXPORT void CalamaresLogHandler( QtMsgType type, const char* msg );
diff --git a/src/libcalamaresui/Settings.cpp b/src/libcalamaresui/Settings.cpp
index 102026a33..b2ed81acf 100644
--- a/src/libcalamaresui/Settings.cpp
+++ b/src/libcalamaresui/Settings.cpp
@@ -46,8 +46,8 @@ Settings::Settings( const QString& settingsFilePath,
                     QObject* parent )
     : QObject( parent )
     , m_debug( debugMode )
-    , m_promptInstall( false )
     , m_doChroot( true )
+    , m_promptInstall( false )
 {
     cDebug() << "Using Calamares settings file at" << settingsFilePath;
     QFile file( settingsFilePath );
diff --git a/src/libcalamaresui/Settings.h b/src/libcalamaresui/Settings.h
index 58f2a61b2..90658513e 100644
--- a/src/libcalamaresui/Settings.h
+++ b/src/libcalamaresui/Settings.h
@@ -57,9 +57,6 @@ public:
 private:
     static Settings* s_instance;
 
-    bool m_debug;
-    bool m_doChroot;
-
     QStringList m_modulesSearchPaths;
 
     QList< QMap< QString, QString > > m_customModuleInstances;
@@ -67,6 +64,8 @@ private:
 
     QString m_brandingComponentName;
 
+    bool m_debug;
+    bool m_doChroot;
     bool m_promptInstall;
 };