diff --git a/src/blackcore/audio_device.h b/src/blackcore/audio_device.h
index 02c8ae320..ad7b5cb70 100644
--- a/src/blackcore/audio_device.h
+++ b/src/blackcore/audio_device.h
@@ -72,10 +72,10 @@ namespace BlackCore
         //! Set new output device
         virtual void setOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) = 0;
 
-        //! Set output volume between 0 ... 300 %
+        //! Set output volume between 0 ... 300%
         virtual void setOutputVolume(int volume) = 0;
 
-        //! Get output volume
+        //! Get output volume between 0 ... 300%
         virtual int getOutputVolume() const = 0;
     };
 }
diff --git a/src/blackcore/context_network.cpp b/src/blackcore/context_network.cpp
index f574d5065..a86cb015a 100644
--- a/src/blackcore/context_network.cpp
+++ b/src/blackcore/context_network.cpp
@@ -23,10 +23,10 @@ namespace BlackCore
         case CRuntimeConfig::LocalInDbusServer:
             return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
         case CRuntimeConfig::Remote:
-            return new BlackCore::CContextNetworkProxy(BlackCore::CDBusServer::ServiceName, conn, mode, runtime);
+            return new CContextNetworkProxy(BlackCore::CDBusServer::ServiceName, conn, mode, runtime);
         case CRuntimeConfig::NotUsed:
         default:
-            return new BlackCore::CContextNetworkEmpty(runtime);
+            return new CContextNetworkEmpty(runtime);
         }
     }
 
diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h
index efc7087de..b6a941b5a 100644
--- a/src/blackcore/context_network_empty.h
+++ b/src/blackcore/context_network_empty.h
@@ -28,9 +28,6 @@ namespace BlackCore
         //! Constructor
         CContextNetworkEmpty(CRuntime *runtime) : IContextNetwork(CRuntimeConfig::NotUsed, runtime) {}
 
-        //! Destructor
-        virtual ~CContextNetworkEmpty() {}
-
     public slots: // IContextNetwork overrides
 
         //! \copydoc IContextNetwork::readAtcBookingsFromSource()
diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp
index 0436fae72..d41fa0f3d 100644
--- a/src/blackcore/context_simulator_impl.cpp
+++ b/src/blackcore/context_simulator_impl.cpp
@@ -206,7 +206,7 @@ namespace BlackCore
         Q_ASSERT(factory);
 
         // We assume we run in the same process as the own aircraft context
-        // Hence we pass in memory refernce to own aircraft object
+        // Hence we pass in memory reference to own aircraft object
         Q_ASSERT(this->getIContextOwnAircraft()->isUsingImplementingObject());
         Q_ASSERT(this->getIContextNetwork()->isUsingImplementingObject());
         IOwnAircraftProvider *ownAircraftProvider = this->getRuntime()->getCContextOwnAircraft();
diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index 6884f1d78..79f9e5b89 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -223,14 +223,14 @@ namespace BlackGui
         void CAtcStationComponent::ps_requestOnlineStationsUpdate()
         {
             this->m_updateTimer->fireTimer();
-            this->m_timestampLastReadOnlineStations = CUpdateTimer::epoch();
+            this->m_timestampLastReadOnlineStations = CUpdateTimer::epoch(); // mark as outdated
         }
 
         void CAtcStationComponent::ps_infoAreaTabBarChanged(int index)
         {
             // ignore in those cases
-            if (!this->isVisibleWidget()) return;
-            if (this->isParentDockWidgetFloating()) return;
+            if (!this->isVisibleWidget()) { return; }
+            if (this->isParentDockWidgetFloating()) { return; }
 
             // here I know I am the selected widget, update, but keep GUI responsive (-> timer)
             QTimer::singleShot(1000, this, SLOT(update()));
diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp
index 893af8971..c5b206d01 100644
--- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp
+++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp
@@ -103,8 +103,12 @@ namespace BlackSimPlugin
 
         CAircraftMapper *CSimulatorFsCommon::mapperInstance()
         {
+            static CVPilotModelMappings *mappings = new CVPilotModelMappings(true);
+
+            // tries to access simObjectsDir, if this is an mapped remote directory
+            // init might hang for a while
             static CAircraftMapper *mapper = new CAircraftMapper(
-                std::unique_ptr<CVPilotModelMappings>(new CVPilotModelMappings(true)), // currently hard wired
+                std::unique_ptr<CVPilotModelMappings>(mappings), // currently hard wired
                 simObjectsDir()
             );
             return mapper;