diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h
index 6b44279a1..cb701b0b1 100644
--- a/src/blackcore/context_simulator.h
+++ b/src/blackcore/context_simulator.h
@@ -72,7 +72,7 @@ namespace BlackCore
         void simulatorStatusChanged(int status);
 
         //! Simulator plugin loaded / unloaded (default info)
-        void simulatorPluginChanged(const BlackMisc::Simulation::CSimulatorPluginInfo &info);
+        void simulatorPluginChanged(BlackMisc::Simulation::CSimulatorPluginInfo info);
 
         //! Render restrictions have been changed
         void renderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance, const BlackMisc::PhysicalQuantities::CLength &maxRenderedBoundary);
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index a2cb792ed..c16f7e6b1 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -41,6 +41,7 @@ namespace BlackCore
 
     public:
         //! ISimulator status
+        //! \todo Qt5.5: Make use of QFlags
         enum SimulatorStatusFlag
         {
             Disconnected = 0,
@@ -48,6 +49,7 @@ namespace BlackCore
             Simulating  = 1 << 1, //!< Is the simulator actually simulating?
             Paused      = 1 << 2, //!< Is the simulator paused?
         };
+        Q_DECLARE_FLAGS(SimulatorStatus, SimulatorStatusFlag)
 
         Q_DECLARE_FLAGS(SimulatorStatus, SimulatorStatusFlag)
 
@@ -180,6 +182,7 @@ namespace BlackCore
 
     signals:
         //! Simulator combined status
+        //! \todo Qt5.5: Make use of QFlags
         void simulatorStatusChanged(int status);
 
         //! Emitted when own aircraft model has changed