diff --git a/projects/roctracer/build.sh b/projects/roctracer/build.sh
index f8d46442b8..ecd9c900df 100755
--- a/projects/roctracer/build.sh
+++ b/projects/roctracer/build.sh
@@ -7,6 +7,8 @@ fatal() {
   exit 1
 }
 
+umask 022
+
 if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$PWD; fi
 if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi
 if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi
diff --git a/projects/roctracer/build_proto.sh b/projects/roctracer/build_proto.sh
index b9f4f14602..046ec297b7 100755
--- a/projects/roctracer/build_proto.sh
+++ b/projects/roctracer/build_proto.sh
@@ -7,6 +7,8 @@ fatal() {
   exit 1
 }
 
+umask 022
+
 if [ -z "$ROCTRACER_ROOT" ]; then export ROCTRACER_ROOT=$PWD; fi
 if [ -z "$BUILD_DIR" ] ; then export BUILD_DIR=$PWD; fi
 if [ -z "$PACKAGE_ROOT" ] ; then export PACKAGE_ROOT=$ROCM_PATH; fi
diff --git a/projects/roctracer/cmake_modules/env.cmake b/projects/roctracer/cmake_modules/env.cmake
index b1966e07cd..2a5d6ab2b8 100644
--- a/projects/roctracer/cmake_modules/env.cmake
+++ b/projects/roctracer/cmake_modules/env.cmake
@@ -89,19 +89,15 @@ elseif ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86" )
 endif ()
 
 ## Find hsa-runtime headers/lib
-find_file ( HSA_RUNTIME_INC "hsa.h" )
-find_file ( HSA_RUNTIME_HSA_INC "hsa/hsa.h" )
+find_file ( HSA_RUNTIME_INC "hsa/hsa.h" )
 find_library ( HSA_RUNTIME_LIB "libhsa-runtime${NBIT}.so" )
 get_filename_component ( HSA_RUNTIME_INC_PATH ${HSA_RUNTIME_INC} DIRECTORY )
-get_filename_component ( HSA_RUNTIME_HSA_INC_PATH ${HSA_RUNTIME_HSA_INC} DIRECTORY )
 get_filename_component ( HSA_RUNTIME_LIB_PATH ${HSA_RUNTIME_LIB} DIRECTORY )
 
 if ( "${HSA_RUNTIME_INC_PATH}" STREQUAL "" )
-  set ( HSA_RUNTIME_INC_PATH ${HSA_RUNTIME_HSA_INC_PATH} )
-endif ()
-if ( NOT "${HSA_RUNTIME_HSA_INC_PATH}" STREQUAL "" )
-  set ( HSA_RUNTIME_HSA_INC_PATH ${HSA_RUNTIME_HSA_INC_PATH}/.. )
+  message ( FATAL_ERROR "HSA headers not found" )
 endif ()
+set ( HSA_RUNTIME_HSA_INC_PATH ${HSA_RUNTIME_INC_PATH}/.. )
 
 find_library ( HSA_KMT_LIB "libhsakmt.so" )
 get_filename_component ( HSA_KMT_LIB_PATH ${HSA_KMT_LIB} DIRECTORY )