diff --git a/src/blackgui/components/settingsguicomponent.cpp b/src/blackgui/components/settingsguicomponent.cpp
index a7119a421..cd11cfccf 100644
--- a/src/blackgui/components/settingsguicomponent.cpp
+++ b/src/blackgui/components/settingsguicomponent.cpp
@@ -71,9 +71,9 @@ namespace BlackGui
 
         void CSettingsGuiComponent::ps_fontChanged()
         {
-            QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt");
-            QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family();
-            QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText();
+            const QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt");
+            const QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family();
+            const QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText();
             QString fontColor = this->m_fontColor.name();
             if (!this->m_fontColor.isValid() || this->m_fontColor.name().isEmpty())
             {
diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h
index cb2057744..73e876133 100644
--- a/src/blackgui/dockwidget.h
+++ b/src/blackgui/dockwidget.h
@@ -235,7 +235,7 @@ namespace BlackGui
         bool m_selected              = false;         //!< selected when tabbed
         bool m_dockWidgetVisible     = false;         //!< logical visible, not to be confused with QDockWidget::isVisible()
         bool m_wasFrameless          = false;         //!< frameless when last floating
-        BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings
+        BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::ps_settingsChanged };
 
         //! Empty widget with no size
         void initTitleBarWidgets();
diff --git a/src/blackgui/settings/navigatorsettings.h b/src/blackgui/settings/navigatorsettings.h
index 84a24161d..2537fb9d3 100644
--- a/src/blackgui/settings/navigatorsettings.h
+++ b/src/blackgui/settings/navigatorsettings.h
@@ -25,7 +25,7 @@ namespace BlackGui
 {
     namespace Settings
     {
-        //! Settings for dockwidget
+        //! Settings for navigator bar
         class BLACKGUI_EXPORT CNavigatorSettings :
             public BlackMisc::CValueObject<CNavigatorSettings>
         {
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index 65dcf96f1..c2aea6e4b 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -219,7 +219,7 @@ void SwiftGuiStd::initGuiSignals()
     connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings, ui->comp_MainInfoArea->getFlightPlanComponent(), [ = ]()
     {
         this->ps_setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings);
-        ui->comp_MainInfoArea->getSettingsComponent()->setSettingsTab(CSettingsComponent::SettingTabNetworkServers);
+        ui->comp_MainInfoArea->getSettingsComponent()->setSettingsTab(CSettingsComponent::SettingTabNetwork);
     });
 
     // text messages