diff --git a/DDDigi/python/dddigi.py b/DDDigi/python/dddigi.py
index e055c4e2acc6aebec1f98155f658f0c417455c37..cd22c7a73741d3e17865d8b75d9e37ade555808c 100644
--- a/DDDigi/python/dddigi.py
+++ b/DDDigi/python/dddigi.py
@@ -221,7 +221,7 @@ def _default_adopt(self, action):
 def _setup(obj, call='adopt', py_call=_default_adopt):
   _import_class('digi', obj)
   cls = getattr(current, obj)
-  setattr(cls, '__'+call, getattr(cls, call))
+  setattr(cls, '__' + call, getattr(cls, call))
   setattr(cls, call, py_call)
   return cls
 
diff --git a/DDDigi/src/DigiMultiContainerProcessor.cpp b/DDDigi/src/DigiMultiContainerProcessor.cpp
index 36747442b39263ec6eebe46c010ab01627f347e2..454cc862034a62d5d6ac9c6ebacf30ef91f2e866 100644
--- a/DDDigi/src/DigiMultiContainerProcessor.cpp
+++ b/DDDigi/src/DigiMultiContainerProcessor.cpp
@@ -54,7 +54,6 @@ void DigiMultiContainerProcessor::adopt_processor(DigiContainerProcessor* action
   else if ( containers.empty() )   {
     except("+++ Processor %s is defined, but no workload was assigned. Request FAILED.");
   }
-  const char* aname = action->name().c_str();
   std::stringstream str;
   std::vector<Key> keys;
   for(const auto& c : containers)    {
@@ -63,9 +62,9 @@ void DigiMultiContainerProcessor::adopt_processor(DigiContainerProcessor* action
     m_work_items.insert(key.item());
     str << c << " ";
   }
-  action->m_container_keys = keys;
+  action->m_container_keys = std::move(keys);
   m_workers.emplace_back(new Worker(action, 0));
-  info("+++ Use processor: %-32s for processing: %s", aname, str.str().c_str());
+  info("+++ Use processor: %-32s for processing: %s", action->c_name(), str.str().c_str());
 }
 
 /// Main functional callback
diff --git a/examples/DDDigi/src/DigiTestFalphaNoise.cpp b/examples/DDDigi/src/DigiTestFalphaNoise.cpp
index cbe437742449c0ceb3a75b6a6766d07209868511..57a31f122c892d25b1bee00f4da6c04e0ee0f696 100644
--- a/examples/DDDigi/src/DigiTestFalphaNoise.cpp
+++ b/examples/DDDigi/src/DigiTestFalphaNoise.cpp
@@ -14,7 +14,7 @@
 /// Framework include files
 #include <DD4hep/Factories.h>
 #include <DD4hep/Printout.h>
-#include <DDDigi/FalphaNoise.h>
+#include <DDDigi/noise/FalphaNoise.h>
 
 /// C/C++ include files
 #include <random>