diff --git a/DDCore/python/dd4hep_base.py b/DDCore/python/dd4hep_base.py
index 9b10e4b5cf046173662a55cc2c20bbd28edb21f1..009cbdc55ae85f2e956ba4e10e00abf057d4d4bc 100644
--- a/DDCore/python/dd4hep_base.py
+++ b/DDCore/python/dd4hep_base.py
@@ -255,5 +255,5 @@ try:
 except:
   print 'WARNING: No units from TGeoUnit can be imported. This is normal for ROOT < 6.12.0'
   TGeoUnits = {}
-  def import_units():
+  def import_units(ns=None):
     return 0
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 334574fb3db85352e99b673dcdb33d6c5f610378..d59e17e3029256e3abc8f7cf1963794c1721117b 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -49,8 +49,25 @@ dd4hep_enable_tests (
   AlignDet
   ClientTests
   Conditions
-  DDCMS
-  DDDB
   DDG4
   Persistency
-  SimpleDetector)
+  SimpleDetector
+  )
+#
+# XercesC dependent stuff
+if ( DD4HEP_USE_XERCESC )
+  dd4hep_print("|++> XercesC PRESENT. Building DDDB examples.")
+  dd4hep_enable_tests (DDDB)
+else()
+  dd4hep_print("|++> XercesC is not present. NOT building DDDB examples.")
+endif()
+#
+# CLHEP dependent stuff:
+find_package (CLHEP QUIET)
+string(FIND "${CLHEP_DIR}" "NOTFOUND" HaveDDCMS)
+if ( NOT ${HaveDDCMS} GREATER 0 )
+  dd4hep_print("|++> XercesC PRESENT. Building DDCMS examples.")
+  dd4hep_enable_tests (DDCMS)
+else()
+  dd4hep_print("|++> CLHEP is not present. NOT building DDCMS examples.")
+endif()
diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt
index b0badec308b56105d99086503f9cdfb416f15448..53edb965589b7c02d3d7a8fa376591af17b04891 100644
--- a/examples/DDDB/CMakeLists.txt
+++ b/examples/DDDB/CMakeLists.txt
@@ -233,6 +233,7 @@ if (DD4HEP_USE_XERCESC)
     DDDB_DeVelo_Gaudi_LONGTEST
     DDDB_DeVelo_LONGTEST
     DDDB_extract_LONGTEST
-    REGEX_PASS "DDDB Database successfully removed" )
+    REGEX_PASS "DDDB Database successfully removed"
+  )
 
 endif()