diff --git a/src/blackcore/context/contextapplication.h b/src/blackcore/context/contextapplication.h
index 01e326903..c00def340 100644
--- a/src/blackcore/context/contextapplication.h
+++ b/src/blackcore/context/contextapplication.h
@@ -66,10 +66,6 @@ namespace BlackCore
             Q_OBJECT
             Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME)
 
-        protected:
-            //! Constructor
-            IContextApplication(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime);
-
         public:
             //! Service name
             static const QString &InterfaceName()
@@ -125,13 +121,6 @@ namespace BlackCore
             //! Work around for audio context, #382
             void fakedSetComVoiceRoom(const BlackMisc::Audio::CVoiceRoomList &requestedRooms);
 
-        protected:
-            //! Compute which process' subscriptions match a given log message.
-            BlackMisc::CIdentifierList subscribersOf(const BlackMisc::CStatusMessage &message) const;
-
-            //! Tracks which processes are subscribed to which patterns of log messages.
-            CLogSubscriptionHash m_logSubscriptions;
-
         public slots:
             //! Log a log message
             //! \note Not pure because it can be called from the base class constructor.
@@ -205,6 +194,15 @@ namespace BlackCore
 
             //!  Remote enabled version of file exists
             virtual bool existsFile(const QString &fileName) const = 0;
+        protected:
+            //! Constructor
+            IContextApplication(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime);
+
+            //! Compute which process' subscriptions match a given log message.
+            BlackMisc::CIdentifierList subscribersOf(const BlackMisc::CStatusMessage &message) const;
+
+            //! Tracks which processes are subscribed to which patterns of log messages.
+            CLogSubscriptionHash m_logSubscriptions;
         };
     } // ns
 } // ns
diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h
index ce31ec382..ff7b59e4d 100644
--- a/src/blackcore/context/contextnetworkimpl.h
+++ b/src/blackcore/context/contextnetworkimpl.h
@@ -31,23 +31,23 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/flightplan.h"
-#include "blackmisc/digestsignal.h"
-#include "blackmisc/identifier.h"
 #include "blackmisc/network/clientlist.h"
 #include "blackmisc/network/server.h"
 #include "blackmisc/network/serverlist.h"
 #include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/network/userlist.h"
-#include "blackmisc/pq/length.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/airspaceaircraftsnapshot.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
-#include "blackmisc/statusmessage.h"
 #include "blackmisc/weather/metar.h"
 #include "blackmisc/weather/metarlist.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/digestsignal.h"
+#include "blackmisc/identifier.h"
 
 class QTimer;
 
diff --git a/src/blackcore/context/contextownaircraftimpl.h b/src/blackcore/context/contextownaircraftimpl.h
index 16a8e1a39..c5ed0bc63 100644
--- a/src/blackcore/context/contextownaircraftimpl.h
+++ b/src/blackcore/context/contextownaircraftimpl.h
@@ -22,15 +22,15 @@
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/selcal.h"
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/identifiable.h"
-#include "blackmisc/identifier.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/length.h"
-#include "blackmisc/settingscache.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/settingscache.h"
+#include "blackmisc/identifiable.h"
+#include "blackmisc/identifier.h"
 
 #include <QObject>
 #include <QReadWriteLock>
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index 926c3d14a..457a8d4be 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -15,16 +15,16 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/aviation/callsignset.h"
-#include "blackmisc/identifiable.h"
-#include "blackmisc/identifier.h"
-#include "blackmisc/pixmap.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/time.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/simulation/interpolationrenderingsetup.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/time.h"
 #include "blackmisc/statusmessage.h"
+#include "blackmisc/identifiable.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/pixmap.h"
 
 #include <QFlags>
 #include <QObject>
diff --git a/src/blackmisc/simplecommandparser.h b/src/blackmisc/simplecommandparser.h
index 0c2ded4a8..03a95cfc6 100644
--- a/src/blackmisc/simplecommandparser.h
+++ b/src/blackmisc/simplecommandparser.h
@@ -93,7 +93,7 @@ namespace BlackMisc
         //! Clean up a command string
         static QString formatCommand(const QString &command);
 
-        //! Command, aka as starts with dot
+        //! Command, starts with dot
         static bool isCommand(const QString &candidate);
     };
 }
diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui
index c214687e0..69a346370 100644
--- a/src/swiftguistandard/swiftguistd.ui
+++ b/src/swiftguistandard/swiftguistd.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>350</width>
-    <height>574</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">