diff --git a/.gitignore b/.gitignore
index cafda6d07e..bd206b0038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ b
 build
 inc/hsa_prof_str.h
 inc/kfd_prof_str.h
+inc/kfd_ostream_ops.h
 test/hsa
 test/MatrixTranspose/MatrixTranspose
 test/MatrixTranspose_test/MatrixTranspose
diff --git a/src/core/loader.h b/src/core/loader.h
index fa2b0e62ad..9f62225d05 100644
--- a/src/core/loader.h
+++ b/src/core/loader.h
@@ -46,7 +46,7 @@ class BaseLoader : public T {
 
   private:
   BaseLoader() {
-    const int flags = RTLD_LAZY;
+    const int flags = RTLD_LAZY|RTLD_NOLOAD;
     handle_ = dlopen(lib_name_, flags);
     if (handle_ == NULL) {
       fprintf(stderr, "roctracer: Loading '%s' failed, %s\n", lib_name_, dlerror());
diff --git a/test/MatrixTranspose_test/MatrixTranspose.cpp b/test/MatrixTranspose_test/MatrixTranspose.cpp
index f8391d784c..3e5b89c868 100644
--- a/test/MatrixTranspose_test/MatrixTranspose.cpp
+++ b/test/MatrixTranspose_test/MatrixTranspose.cpp
@@ -314,6 +314,8 @@ void init_tracing() {
   // Enable HIP activity tracing
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+  // Enable KFD API tracing
+  ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_KFD_API));
 }
 
 // Start tracing routine
@@ -329,6 +331,7 @@ void stop_tracing() {
   ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HIP_API));
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+  ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_KFD_API));
   ROCTRACER_CALL(roctracer_flush_activity());
   std::cout << "# STOP  #############################" << std::endl << std::flush;
 }