diff --git a/script/gen_ostream_ops.py b/script/gen_ostream_ops.py
index 0ffb43ef07..95426b2599 100755
--- a/script/gen_ostream_ops.py
+++ b/script/gen_ostream_ops.py
@@ -85,7 +85,7 @@ def process_struct(file_handle, cppHeader_struct, cppHeader, parent_hier_name, a
         str = ''
         if "union" not in mtype:
             indent = ""
-            str += "    if (std::string(\"" + cppHeader_struct + "::" + name + "\").find(" + apiname.upper() + "_structs_regex" + "))   {\n"
+            str += "    if (std::string(\"" + cppHeader_struct + "::" + name + "\").find(" + apiname.upper() + "_structs_regex" + ") != std::string::npos)   {\n"
             indent = "    "
             str += indent + "  roctracer::" + apiname.lower() + "_support::operator<<(out, \"" + name + "=\");\n"
             str += indent + "  roctracer::" + apiname.lower() + "_support::operator<<(out, v." + name + ");\n"
diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp
index 517ee161f7..643ff16cbb 100644
--- a/src/util/hsa_rsrc_factory.cpp
+++ b/src/util/hsa_rsrc_factory.cpp
@@ -205,6 +205,7 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_amd_memory_pool_allocate = table->amd_ext_->hsa_amd_memory_pool_allocate_fn;
       hsa_api_.hsa_amd_agents_allow_access = table->amd_ext_->hsa_amd_agents_allow_access_fn;
       hsa_api_.hsa_amd_memory_async_copy = table->amd_ext_->hsa_amd_memory_async_copy_fn;
+      hsa_api_.hsa_amd_memory_async_copy_rect = table->amd_ext_->hsa_amd_memory_async_copy_rect_fn;
 
       hsa_api_.hsa_amd_signal_async_handler = table->amd_ext_->hsa_amd_signal_async_handler_fn;
       hsa_api_.hsa_amd_profiling_set_profiler_enabled = table->amd_ext_->hsa_amd_profiling_set_profiler_enabled_fn;
@@ -245,6 +246,7 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_amd_memory_pool_allocate = hsa_amd_memory_pool_allocate;
       hsa_api_.hsa_amd_agents_allow_access = hsa_amd_agents_allow_access;
       hsa_api_.hsa_amd_memory_async_copy = hsa_amd_memory_async_copy;
+      hsa_api_.hsa_amd_memory_async_copy_rect = hsa_amd_memory_async_copy_rect;
 
       hsa_api_.hsa_amd_signal_async_handler = hsa_amd_signal_async_handler;
       hsa_api_.hsa_amd_profiling_set_profiler_enabled = hsa_amd_profiling_set_profiler_enabled;
diff --git a/src/util/hsa_rsrc_factory.h b/src/util/hsa_rsrc_factory.h
index 21e25082ab..cbeafbc671 100644
--- a/src/util/hsa_rsrc_factory.h
+++ b/src/util/hsa_rsrc_factory.h
@@ -106,6 +106,7 @@ struct hsa_pfn_t {
   decltype(hsa_amd_memory_pool_allocate)* hsa_amd_memory_pool_allocate;
   decltype(hsa_amd_agents_allow_access)* hsa_amd_agents_allow_access;
   decltype(hsa_amd_memory_async_copy)* hsa_amd_memory_async_copy;
+  decltype(hsa_amd_memory_async_copy_rect)* hsa_amd_memory_async_copy_rect;
 
   decltype(hsa_amd_signal_async_handler)* hsa_amd_signal_async_handler;
   decltype(hsa_amd_profiling_set_profiler_enabled)* hsa_amd_profiling_set_profiler_enabled;