diff --git a/CMakeLists.txt b/CMakeLists.txt
index 185b62dd65..e90a4f7924 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,8 +109,10 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/roctx.h DESTINATION include )
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/roctracer_roctx.h DESTINATION include )
 install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION ../lib RENAME ${ROCTX_LIBRARY}.so )
 
-## kfdwrapper
-#install ( TARGETS "kfdwrapper64" LIBRARY DESTINATION lib )
+## KFD wrapper
+if ( DEFINED KFD_WRAPPER )
+  install ( TARGETS "kfdwrapper64" LIBRARY DESTINATION lib )
+endif ()
 
 ## Packaging directives
 set ( CPACK_GENERATOR "DEB" "RPM" "TGZ" )
diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake
index 727cd0839e..9ad3fbf23b 100644
--- a/cmake_modules/env.cmake
+++ b/cmake_modules/env.cmake
@@ -43,7 +43,7 @@ if ( DEFINED ENV{CMAKE_DEBUG_TRACE} )
   add_definitions ( -DDEBUG_TRACE=1 )
 endif()
 
-## Enable KFD wrapper
+## Enable HIP_VDI mode
 if ( DEFINED HIP_VDI )
   add_definitions ( -DHIP_VDI=${HIP_VDI} )
 else()
diff --git a/src/core/roctracer.cpp b/src/core/roctracer.cpp
index e93179de56..a3b701c3ee 100644
--- a/src/core/roctracer.cpp
+++ b/src/core/roctracer.cpp
@@ -92,7 +92,6 @@ THE SOFTWARE.
 #endif
 
 static inline uint32_t GetPid() { return syscall(__NR_getpid); }
-static inline uint32_t GetTid() { return syscall(__NR_gettid); }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Mark callback