diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index b7a7588b94ba08b47ad75a0064573d809bd4106d..6d835c391069bcffdefa5d2eed29ebdfc94bc7fa 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -11,10 +11,10 @@ LCG_AA_project(Geant4 11.3.0)
 LCG_AA_project(Geant4-vecgeom-scalar 11.3.0)
 
 LCG_AA_project(Garfield++  HEAD  GIT=https://gitlab.cern.ch/garfield/garfieldpp.git)
-if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu|el)
-  if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER_EQUAL 13)) OR (${LCG_COMP} MATCHES clang))
-    LCG_AA_project(Gaudi  v39r1  GIT=https://gitlab.cern.ch/gaudi/Gaudi.git)
-  endif()
+if( ((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER_EQUAL 13)) OR
+    ((NOT ${LCG_OS} MATCHES mac) AND (${LCG_COMP} MATCHES clang) AND (${LCG_COMPVERS} GREATER_EQUAL 16)) OR
+    ((${LCG_OS} MATCHES mac) AND (${LCG_OSVERS} GREATER_EQUAL 15)) )
+  LCG_AA_project(Gaudi  v39r2  GIT=https://gitlab.cern.ch/gaudi/Gaudi.git)
 endif()
 LCG_AA_project(DD4hep                  01.30                                    )
 
@@ -722,7 +722,7 @@ LCG_external_package(qtpy              1.7.1
 if(${LCG_OS} MATCHES centos|el AND NOT (${LCG_COMP} MATCHES clang AND ${LCG_COMPVERS} EQUAL 15) )
    LCG_external_package(R               4.3.0                                   )
 endif()
-LCG_external_package(rangev3           0.11.0                                   )
+LCG_external_package(rangev3           0.12.0                                   )
 LCG_external_package(railroad_diagrams 1.1.1                                    )
 LCG_external_package(rapidjson         1.1.0                                    )
 LCG_external_package(rapidyaml         0.7.0                                   )
diff --git a/frameworks/CMakeLists.txt b/frameworks/CMakeLists.txt
index ff1eec381635f4b2c15a87e3805fc6d39de7b0e6..c9adea46f1a5182f667d618fdfac08d73a0f2a31 100644
--- a/frameworks/CMakeLists.txt
+++ b/frameworks/CMakeLists.txt
@@ -12,24 +12,23 @@ LCGPackage_Add(
               PYTHONPATH=${ROOT_home}/lib  # Needed at runtime for tests
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> 
              -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-             IF ${CMAKE_BUILD_TYPE} STREQUAL Debug AND ${LCG_TARGET} MATCHES "clang" THEN 
-               -DGAUDI_SLOW_DEBUG=TRUE
-             ENDIF
              -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
              -DCMAKE_FIND_FRAMEWORK=LAST 
              -DBoost_NO_BOOST_CMAKE=FALSE
              -DHOST_BINARY_TAG=${LCG_platform}
-	     IF ${LCG_OS} MATCHES ubuntu THEN
-	        -DGAUDI_USE_GPERFTOOLS=FALSE
+	     IF ${LCG_OS} MATCHES ubuntu|mac THEN
+               -DGAUDI_USE_GPERFTOOLS=FALSE
+	     ENDIF
+             # Don't use unwind on mac, Gaudi won't compile the unwind code
+             # if it's not x86_64
+	     IF ${LCG_OS} MATCHES mac THEN
+               -DGAUDI_USE_UNWIND=FALSE
 	     ENDIF
-  INSTALL_COMMAND ${MAKE} install
-          IF NOT <VERSION> STREQUAL master AND <VERSION> VERSION_LESS v35r0 THEN
-             COMMAND ${EXEC} bash -c "cp -n -r <INSTALL_DIR>/*.cmake <INSTALL_DIR>/cmake"
-          ENDIF
   DEPENDS Boost Python GSL ROOT clhep AIDA XercesC rangev3 cppgsl xenv six fmt pytest PyYAML
-          jsonmcpp HepPDT CppUnit libunwind doxygen Catch2 networkx pytest_cov jemalloc
-          IF NOT ${LCG_OS} MATCHES ubuntu THEN gperftools ENDIF
+          jsonmcpp HepPDT CppUnit doxygen Catch2 networkx pytest_cov jemalloc
+          IF NOT ${LCG_OS} MATCHES ubuntu|mac THEN gperftools ENDIF
+          IF NOT ${LCG_OS} MATCHES mac THEN libunwind ENDIF
 )
 
 #   Add Gaudi tests only of Gaudi is actually build (disable ubuntu for the time being)