diff --git a/Control/AthenaBaseComps/AthenaBaseComps/GaudiComponentVisitor.h b/Control/AthenaBaseComps/AthenaBaseComps/GaudiComponentVisitor.h
index 8d6cc91860077545033b38a1b5bd9c72045acc48..0729eb993206c974c874735e37936d6e63de2ed5 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/GaudiComponentVisitor.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/GaudiComponentVisitor.h
@@ -68,7 +68,7 @@ namespace xGaudi {
             void visit( T_Component* a_component ) const override { std::invoke( *m_func, a_component ); }
          };
          recursiveVisit( components, Visitor{&callable}, reject_filter, ignore );
-         return ignore;
+         return std::move (ignore);
       }
 
    private:
diff --git a/Control/AthenaBaseComps/src/DynamicDataHelper.cxx b/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
index 7b711a9e91ad49f9f65978df4a155ef3f396bada..9ce76b6d7daeef71eb1c57efa33532bb35b95756 100644
--- a/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
+++ b/Control/AthenaBaseComps/src/DynamicDataHelper.cxx
@@ -62,10 +62,10 @@ namespace Ath {
       return StatusCode::SUCCESS;
    }
 
-   void DynamicDataHelper::gatherDataHandlesAndDynamicConsumers(const std::string &parent_name, Gaudi::Algorithm *theAlgorithm) {
+   void DynamicDataHelper::gatherDataHandlesAndDynamicConsumers(const std::string &/*parent_name*/, Gaudi::Algorithm *theAlgorithm) {
          //      |> debugging
          auto algorithm_visitor =
-            [this,&parent_name](Gaudi::Algorithm *an_alg) {
+            [this](Gaudi::Algorithm *an_alg) {
                IDynamicDataConsumer *a_dyn_data_consumer=dynamic_cast<IDynamicDataConsumer *>(an_alg);
                if (a_dyn_data_consumer) {
                   m_dynDataConsumer.push_back(std::make_pair(a_dyn_data_consumer, an_alg));
@@ -76,7 +76,7 @@ namespace Ath {
                std::vector<IAlgTool *> &tools ATLAS_THREAD_SAFE
                   = const_cast< std::vector<IAlgTool *> &>(const_cast<const Gaudi::Algorithm *>(an_alg)->tools());
                //                               |> debugging
-               auto tool_visitor = [this, an_alg, &parent_name](IAlgTool *alg_tool) {
+               auto tool_visitor = [this, an_alg](IAlgTool *alg_tool) {
                   IDynamicDataConsumer *a_dyn_data_consumer=dynamic_cast<IDynamicDataConsumer *>(alg_tool);
                   if (a_dyn_data_consumer) {
                      m_dynDataConsumer.push_back(std::make_pair(a_dyn_data_consumer, an_alg));