diff --git a/CMakeLists.txt b/CMakeLists.txt
index 557218d49..b5dd8e212 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,26 +340,6 @@ else ()
 
 endif ()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin") # we must call library install here in
-    # MacOs
-    foreach (lib ${rest_libraries})
-        install(
-            TARGETS ${lib}
-            RUNTIME DESTINATION bin
-            LIBRARY DESTINATION bin
-            ARCHIVE DESTINATION lib)
-    endforeach ()
-
-    foreach (exe ${rest_exes})
-        install(
-            TARGETS ${exe}
-            RUNTIME DESTINATION bin
-            LIBRARY DESTINATION bin
-            ARCHIVE DESTINATION lib)
-    endforeach ()
-
-endif ()
-
 # Copy pcm files
 if (CMAKE_SYSTEM_NAME MATCHES "Windows")
 
diff --git a/cmake/thisREST.cmake b/cmake/thisREST.cmake
index 450284ef2..7087444fb 100644
--- a/cmake/thisREST.cmake
+++ b/cmake/thisREST.cmake
@@ -136,13 +136,14 @@ ${loadLCG}
 
 \# check active shell by checking for existence of _VERSION variable
 if [[ -n \\\"\\\${BASH_VERSION}\\\" ]]; then
-    thisdir=\\\$(cd \\\$(dirname \\\${BASH_ARGV[0]}); pwd)
+    thisfile=\\\${BASH_SOURCE[0]}
 elif [[ -n \\\"\\\${ZSH_VERSION}\\\" ]]; then
-    thisdir=\\\$(cd \\\$(dirname \\\$0); pwd)
+    thisfile=\\\${(%):-%x}
 else
     echo \\\"Invalid shell! Either source with bash or zsh!\\\"
     return 1
 fi
+thisdir=\\\$(cd \\\"\\\$(dirname \\\"\\\${thisfile}\\\")\\\"; pwd)
 
 \# if thisroot.sh script is found we load the same ROOT version as used in compilation
 if [[ -f \\\"${thisROOT}\\\" ]]; then
diff --git a/source/framework/core/src/TRestDataSet.cxx b/source/framework/core/src/TRestDataSet.cxx
index 833b6d6e0..22ba8334a 100644
--- a/source/framework/core/src/TRestDataSet.cxx
+++ b/source/framework/core/src/TRestDataSet.cxx
@@ -299,6 +299,8 @@
 ///
 #include "TRestDataSet.h"
 
+#include <TLeaf.h>
+
 #include "TRestRun.h"
 #include "TRestTools.h"