diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp
index 04511df2a..f29435872 100644
--- a/src/blackcore/context_runtime.cpp
+++ b/src/blackcore/context_runtime.cpp
@@ -69,7 +69,7 @@ namespace BlackCore
             this->initDBusConnection(dbusAddress);
             if (!this->m_dbusConnection.isConnected())
             {
-                QString notConnected("DBus connection failed");
+                QString notConnected("DBus connection failed:");
                 QString e = this->m_dbusConnection.lastError().message();
                 if (!e.isEmpty()) notConnected.append(" ").append(e);
                 Q_ASSERT_X(false, "CRuntime::init", notConnected.toUtf8().constData());
@@ -311,13 +311,19 @@ namespace BlackCore
 
     void CRuntime::initDBusConnection(const QString &address)
     {
-        if (this->m_initDBusConnection) return;
+        if (this->m_initDBusConnection) { return; }
         if (address.isEmpty() || address == CDBusServer::sessionDBusServer())
+        {
             this->m_dbusConnection = QDBusConnection::sessionBus();
+        }
         else if (address == CDBusServer::systemDBusServer())
+        {
             this->m_dbusConnection = QDBusConnection::sessionBus();
+        }
         else
+        {
             this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime");
+        }
     }
 
     const IContextApplication *CRuntime::getIContextApplication() const
diff --git a/src/blackgui/components/cockpitinfoareacomponent.ui b/src/blackgui/components/cockpitinfoareacomponent.ui
index 72aa62ac4..141587b32 100644
--- a/src/blackgui/components/cockpitinfoareacomponent.ui
+++ b/src/blackgui/components/cockpitinfoareacomponent.ui
@@ -67,7 +67,7 @@
       <number>0</number>
      </property>
      <property name="topMargin">
-      <number>0</number>
+      <number>2</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
@@ -119,7 +119,7 @@
       <number>0</number>
      </property>
      <property name="topMargin">
-      <number>0</number>
+      <number>2</number>
      </property>
      <property name="rightMargin">
       <number>0</number>
diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index f28548189..5a9232f28 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -38,6 +38,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             this->m_logoffCountdownTimer = new QTimer(this);
+            this->m_logoffCountdownTimer->setObjectName("CLoginComponent:m_logoffCountdownTimer");
             this->ui->pb_LogoffTimeout->setMaximum(LogoffIntervalSeconds);
             this->ui->pb_LogoffTimeout->setValue(LogoffIntervalSeconds);
             connect(this->m_logoffCountdownTimer, &QTimer::timeout, this, &CLoginComponent::ps_logoffCountdown);
diff --git a/src/blackgui/components/settingssimulatorcomponent.ui b/src/blackgui/components/settingssimulatorcomponent.ui
index af2f0b317..39ed83c85 100644
--- a/src/blackgui/components/settingssimulatorcomponent.ui
+++ b/src/blackgui/components/settingssimulatorcomponent.ui
@@ -309,7 +309,7 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
+    <spacer name="vs_SettingsSimulatorComponent">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -322,25 +322,7 @@
     </spacer>
    </item>
    <item>
-    <widget class="BlackGui::Components::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx">
-     <layout class="QVBoxLayout" name="vl_SettingsSimulatorSpecific">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-     </layout>
-    </widget>
+    <widget class="BlackGui::Components::CSettingsFsxComponent" name="comp_SettingsSimulatorFsx"/>
    </item>
   </layout>
  </widget>
diff --git a/src/blackgui/levelmeter.cpp b/src/blackgui/levelmeter.cpp
index d03112be2..ad0d08393 100644
--- a/src/blackgui/levelmeter.cpp
+++ b/src/blackgui/levelmeter.cpp
@@ -30,6 +30,7 @@ namespace BlackGui
 
         connect(m_redrawTimer, &QTimer::timeout, this, &CLevelMeter::ps_redrawTimerExpired);
         m_redrawTimer->start(RedrawInterval);
+        m_redrawTimer->setObjectName("CLevelMeter");
     }
 
     CLevelMeter::~CLevelMeter()
diff --git a/src/blackgui/levelmeter.h b/src/blackgui/levelmeter.h
index b2eaef1d7..aabc7d93f 100644
--- a/src/blackgui/levelmeter.h
+++ b/src/blackgui/levelmeter.h
@@ -20,17 +20,15 @@
 namespace BlackGui
 {
 
-    /**
-     * Widget which displays a vertical audio level meter, indicating the
-     * RMS and peak levels of the window of audio samples most recently analyzed
-     * by the Engine.
-     */
+    //! Widget which displays a vertical audio level meter, indicating the
+    //! RMS and peak levels of the window of audio samples most recently analyzed
+    //! by the Engine.
     class CLevelMeter : public QWidget
     {
         Q_OBJECT
     public:
         //! Constructor
-        CLevelMeter(QWidget *parent = 0);
+        CLevelMeter(QWidget *parent = nullptr);
 
         //! Destructor
         ~CLevelMeter();
@@ -76,7 +74,7 @@ namespace BlackGui
         //! Time at which m_peakHoldLevel was last changed.
         QTime m_peakHoldLevelChanged;
 
-        QTimer *m_redrawTimer;
+        QTimer *m_redrawTimer = nullptr;
         QColor m_rmsColor;
         QColor m_peakColor;
     };
diff --git a/src/blackgui/managedstatusbar.cpp b/src/blackgui/managedstatusbar.cpp
index dfb994741..8416c7618 100644
--- a/src/blackgui/managedstatusbar.cpp
+++ b/src/blackgui/managedstatusbar.cpp
@@ -50,6 +50,7 @@ namespace BlackGui
 
         // timer
         this->m_timerStatusBar = new QTimer(this);
+        this->m_timerStatusBar->setObjectName(this->objectName().append(":m_timerStatusBar"));
         this->m_timerStatusBar->setSingleShot(true);
         connect(this->m_timerStatusBar, &QTimer::timeout, this, &CManagedStatusBar::ps_clearStatusBar);
 
diff --git a/src/blackgui/transpondermodeselector.cpp b/src/blackgui/transpondermodeselector.cpp
index bc1a19d78..9fed4af51 100644
--- a/src/blackgui/transpondermodeselector.cpp
+++ b/src/blackgui/transpondermodeselector.cpp
@@ -16,6 +16,7 @@ namespace BlackGui
     CTransponderModeSelector::CTransponderModeSelector(QWidget *parent) : QComboBox(parent)
     {
         QComboBox::insertItems(0, CTransponderModeSelector::modes());
+        this->m_resetTimer.setObjectName(this->objectName().append(":m_resetTimer"));
         connect(&this->m_resetTimer, &QTimer::timeout, this, &CTransponderModeSelector::resetTransponderMode);
         connect(this, &CTransponderModeSelector::currentTextChanged, this, &CTransponderModeSelector::setSelectedTransponderModeAsString);
         this->m_resetTimer.setInterval(5000);
diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h
index baf023f5b..d7e712012 100644
--- a/src/blackmisc/network/userlist.h
+++ b/src/blackmisc/network/userlist.h
@@ -7,6 +7,8 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKMISC_NETWORK_USERLIST_H
 #define BLACKMISC_NETWORK_USERLIST_H