diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp
index 948d3fb7b..20b44c440 100644
--- a/src/blackgui/components/dbstashcomponent.cpp
+++ b/src/blackgui/components/dbstashcomponent.cpp
@@ -68,10 +68,10 @@ namespace BlackGui
             connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelDataChanged, this, &CDbStashComponent::ps_onRowCountChanged);
 
             // copy over buttons
-            connect(ui->pb_AircraftIcao, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected);
-            connect(ui->pb_AirlineIcao, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected);
-            connect(ui->pb_Livery, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected);
-            connect(ui->pb_Distributor, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected);
+            connect(ui->pb_AircraftIcao, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverValuesToSelectedModels);
+            connect(ui->pb_AirlineIcao, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverValuesToSelectedModels);
+            connect(ui->pb_Livery, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverValuesToSelectedModels);
+            connect(ui->pb_Distributor, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverValuesToSelectedModels);
             connect(ui->pb_Model, &QPushButton::pressed, this, &CDbStashComponent::ps_modifyModelDialog);
 
             ui->tvp_StashAircraftModels->menuAddItems(CAircraftModelView::MenuRemoveSelectedRows);
@@ -423,14 +423,15 @@ namespace BlackGui
             return stashModel;
         }
 
-        void CDbStashComponent::ps_copyOverPartsToSelected()
         {
-            QObject *sender = QObject::sender();
-            BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "missing mapping component");
+        void CDbStashComponent::ps_copyOverValuesToSelectedModels()
+        {
+            const QObject *sender = QObject::sender();
+            BLACK_VERIFY_X(this->getMappingComponent(), Q_FUNC_INFO, "Missing mapping component");
             if (!this->getMappingComponent()) { return; }
             if (!ui->tvp_StashAircraftModels->hasSelection()) { return; }
 
-            CAircraftModel model(this->getMappingComponent()->getEditorAircraftModel());
+            const CAircraftModel model(this->getMappingComponent()->getEditorAircraftModel());
             if (sender == ui->pb_AircraftIcao)
             {
                 this->applyToSelected(model.getAircraftIcaoCode());
diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h
index bf2abfbd8..89c584d6b 100644
--- a/src/blackgui/components/dbstashcomponent.h
+++ b/src/blackgui/components/dbstashcomponent.h
@@ -68,7 +68,7 @@ namespace BlackGui
             explicit CDbStashComponent(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CDbStashComponent();
+            virtual ~CDbStashComponent();
 
             //! Test the given model if it can be stashed
             BlackMisc::CStatusMessage validateStashModel(const BlackMisc::Simulation::CAircraftModel &model, bool allowReplace) const;
@@ -157,7 +157,7 @@ namespace BlackGui
                                             const BlackMisc::CStatusMessageList &msgs, bool sendingSuccesful, bool directWrite);
 
             //! Copy over values
-            void ps_copyOverPartsToSelected();
+            void ps_copyOverValuesToSelectedModels();
 
             //! Display model dialog
             void ps_modifyModelDialog();
diff --git a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
index 2e0101957..80a4f8638 100644
--- a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
+++ b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h
@@ -32,6 +32,7 @@ namespace BlackMisc
         namespace FsCommon
         {
             //! Model mappings
+            //! \deprecated vPilot rules might be removed in future
             class BLACKMISC_EXPORT CVPilotRulesReader : public QObject
             {
                 Q_OBJECT