diff --git a/GaudiAlg/include/GaudiAlg/HistoID.h b/GaudiAlg/include/GaudiAlg/HistoID.h
index ee9836b1d86f8542cc99dfacfde1b8444e2c22f0..0e7167d75bca58784a5f6c6c6c08d7666dbd4f57 100644
--- a/GaudiAlg/include/GaudiAlg/HistoID.h
+++ b/GaudiAlg/include/GaudiAlg/HistoID.h
@@ -17,6 +17,7 @@
 // ============================================================================
 #include "GaudiAlg/GaudiAlg.h"
 #include "GaudiAlg/GaudiHistoID.h"
+#include <vector>
 // ============================================================================
 
 // ============================================================================
diff --git a/GaudiKernel/CMakeLists.txt b/GaudiKernel/CMakeLists.txt
index 2d53646fbbcfc500e9707eb85ca960c131c58b39..6c0c76c01784437647bb78ef5ab8208e0d485060 100644
--- a/GaudiKernel/CMakeLists.txt
+++ b/GaudiKernel/CMakeLists.txt
@@ -393,8 +393,7 @@ if(BUILD_TESTING)
 
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/custom_factory_testdir)
   add_test(NAME ${package_name}.genconf_with_custom_factory
-    COMMAND ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH=$<TARGET_FILE_DIR:test_CustomFactory>:$<TARGET_FILE_DIR:GaudiCoreSvc>:$ENV{LD_LIBRARY_PATH}
-            $<TARGET_FILE:genconf>
+    COMMAND run $<TARGET_FILE:genconf>
             -o ${CMAKE_CURRENT_BINARY_DIR}/custom_factory_testdir
             -p CustomFactoryTest
             -i test_CustomFactory
diff --git a/GaudiKernel/src/Util/genconf.cpp b/GaudiKernel/src/Util/genconf.cpp
index 04f8dad06a813da27e3a03fb06fc298df706928b..8e1a293d371d946b06e98ed09ae21a8aa9b91a72 100644
--- a/GaudiKernel/src/Util/genconf.cpp
+++ b/GaudiKernel/src/Util/genconf.cpp
@@ -755,7 +755,7 @@ bool configGenerator::genComponent( const std::string& libName, const std::strin
 
   // name of the auto-generated module
   const string pyName  = ( fs::path( m_outputDirName ) / fs::path( libName + "Conf.py" ) ).string();
-  const string modName = fs::basename( fs::path( pyName ).leaf() );
+  const string modName = fs::path( pyName ).filename().stem().string();
 
   m_db2Buf << "        },\n    },\n";