diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0380f0e57687e54c71fb8fd57c03eb6e0a903fc..707b0886bd7a27cf4f8c332656f4524b9cfd9ed3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,25 +200,20 @@ ELSE()
 
   include(DD4hep_XML_setup)
 
-  IF(DD4HEP_BUILD_DEBUG MATCHES "ON" OR (CMAKE_BUILD_TYPE MATCHES "DEBUG|Debug" AND NOT DD4HEP_BUILD_DEBUG MATCHES "OFF"))
-    message(STATUS "BUILD DD4HEP with debug extensions")
-    set(DD4HEP_BUILD_DEBUG ON)
-    add_compile_definitions(DD4HEP_DEBUG=1)
-  ELSE()
-    set(DD4HEP_BUILD_DEBUG OFF)
-  ENDIF()
-
   #These packages are mandatory
   SET(DD4HEP_SELECTED_PACKAGE DDCore)
   FOREACH(DDPackage GaudiPluginService DDParsers DDCore)
     dd4hep_print("|> Building ${DDPackage}")
     add_subdirectory(${DDPackage})
   ENDFOREACH()
+
   IF(DD4HEP_BUILD_DEBUG MATCHES "ON" OR (CMAKE_BUILD_TYPE MATCHES "DEBUG|Debug" AND NOT DD4HEP_BUILD_DEBUG MATCHES "OFF"))
-    target_compile_definitions(DDCore PUBLIC DD4HEP_DEBUG=1)
+    message(STATUS "BUILD DD4HEP and depending software with debug extensions")
+    set(DD4HEP_BUILD_DEBUG ON)
+  ELSE()
+    set(DD4HEP_BUILD_DEBUG OFF)
   ENDIF()
 
-
   message(STATUS "BUILD Packages: ${DD4HEP_BUILD_PACKAGES}")
   FOREACH(DDPackage IN LISTS DD4HEP_BUILD_PACKAGES)
     dd4hep_print("|> Building ${DDPackage}")
diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp
index 93e4c00234edac470398105508622a6b049cce13..c2add7a18d94f9c652edc4760ccd0312ab9ad6f6 100644
--- a/DDCore/src/Volumes.cpp
+++ b/DDCore/src/Volumes.cpp
@@ -1009,7 +1009,7 @@ std::string dd4hep::toStringMesh(PlacedVolume place, int prec)   {
   struct _numbering {
     double adjust(double value)  const   {
       if ( std::abs(value) < TGeoShape::Tolerance() )
-	return 0.0;
+        return 0.0;
       return value/dd4hep::cm;
     }
   } _vertex;
diff --git a/DDCore/src/plugins/ShapePlugins.cpp b/DDCore/src/plugins/ShapePlugins.cpp
index b5b390a2722b2c6afb7b7e25b22b16b7ccfcf281..af394f5d7edef4fea4b26664205d5a1d0a19661c 100644
--- a/DDCore/src/plugins/ShapePlugins.cpp
+++ b/DDCore/src/plugins/ShapePlugins.cpp
@@ -957,8 +957,8 @@ void* shape_mesh_verifier(Detector& description, int argc, char** argv)    {
         solid.setDimensions(params);
       }
       else if ( isInstance<PseudoTrap>(solid) )   {
-        //auto params = solid.dimensions();
-        //solid.setDimensions(params);
+        auto params = solid.dimensions();
+        solid.setDimensions(params);
       }
       else if ( solid->IsA() != TGeoCompositeShape::Class() )   {
         auto params = solid.dimensions();
diff --git a/DDParsers/CMakeLists.txt b/DDParsers/CMakeLists.txt
index 01fc336c0e46bae81e72a2967d2ad7498353d320..85a16c24495aa76f50a20c268e3049b64c346441 100644
--- a/DDParsers/CMakeLists.txt
+++ b/DDParsers/CMakeLists.txt
@@ -23,6 +23,9 @@ add_library(DDParsers ${DDParsers_SOURCES} ${DDParsers_SPIRIT_SOURCES})
 add_library(DD4hep::DDParsers ALIAS DDParsers)
 
 target_compile_definitions(DDParsers INTERFACE BOOST_SPIRIT_USE_PHOENIX_V3)
+IF( DD4HEP_USE_GEANT4_UNITS )
+  target_compile_definitions(DDParsers PUBLIC DD4HEP_USE_GEANT4_UNITS=1)
+ENDIF()
 
 target_include_directories(DDParsers
   PUBLIC
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 17d96a51cdb5343c72261f8688b266e49c52ad02..a5a259b21f33b81cddb94d68eb831567b18edf95 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -43,11 +43,6 @@ macro(dd4hep_set_compiler_flags)
     set ( COMPILER_FLAGS ${COMPILER_FLAGS} -Winconsistent-missing-override -Wno-c++1z-extensions -Wheader-hygiene )
   endif()
 
-  IF( DD4HEP_USE_GEANT4_UNITS )
-    MESSAGE(STATUS "+++ Building DD4hep with Geant4 units......")
-    add_compile_definitions(DD4HEP_USE_GEANT4_UNITS=1)
-  ENDIF()
-  
   FOREACH( FLAG ${COMPILER_FLAGS} )
     ## meed to replace the minus or plus signs from the variables, because it is passed
     ## as a macro to g++ which causes a warning about no whitespace after macro
@@ -570,10 +565,6 @@ function(dd4hep_add_dictionary dictionary )
     LIST(APPEND comp_defs ${def})
   endforeach()
 
-if(DD4HEP_BUILD_DEBUG)
-    LIST(APPEND comp_defs DD4HEP_DEBUG=1)
-  endif()
-
   foreach(DEP ${ARG_USES})
     # Get INCLUDE DIRECTORIES from Dependencies
     LIST(APPEND inc_dirs $<TARGET_PROPERTY:${DEP},INTERFACE_INCLUDE_DIRECTORIES>)
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 39bb0468d095dee083e43813f2575e2c5a92f21a..fe3b405a53dd4b9d4af9e8fbea49fab59752baf5 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -52,10 +52,6 @@ endif()
 FIND_DEPENDENCY(Boost REQUIRED)
 DD4HEP_SETUP_BOOST_TARGETS()
 
-if(DD4HEP_BUILD_DEBUG)
-  add_compile_definitions(DD4HEP_DEBUG=1)
-endif()
-
 if(DD4HEP_USE_GEANT4)
   MESSAGE(STATUS "@CMAKE_PROJECT_NAME@ uses Geant4")
   IF(DD4HEP_USE_CLHEP)