diff --git a/projects/rocprofiler-systems/source/bin/omnitrace/details.cpp b/projects/rocprofiler-systems/source/bin/omnitrace/details.cpp
index 7cd9abc34b..8fec016510 100644
--- a/projects/rocprofiler-systems/source/bin/omnitrace/details.cpp
+++ b/projects/rocprofiler-systems/source/bin/omnitrace/details.cpp
@@ -48,7 +48,8 @@ get_whole_function_names()
         "rocr::core::Signal::WaitAny", "rocr::core::Runtime::AsyncEventsLoop",
         "rocr::core::BusyWaitSignal::WaitAcquire",
         "rocr::core::BusyWaitSignal::WaitRelaxed", "rocr::HSA::hsa_signal_wait_scacquire",
-        "rocr::os::ThreadTrampoline", "event_base_loop"
+        "rocr::os::ThreadTrampoline", "rocr::image::ImageRuntime::CreateImageManager",
+        "rocr::AMD::GpuAgent::GetInfo", "rocr::HSA::hsa_agent_get_info", "event_base_loop"
     };
 #else
     // should hopefully be removed soon
diff --git a/projects/rocprofiler-systems/source/bin/omnitrace/module_function.cpp b/projects/rocprofiler-systems/source/bin/omnitrace/module_function.cpp
index 0b8cdcff80..cd89e30c67 100644
--- a/projects/rocprofiler-systems/source/bin/omnitrace/module_function.cpp
+++ b/projects/rocprofiler-systems/source/bin/omnitrace/module_function.cpp
@@ -415,9 +415,10 @@ module_function::is_routine_constrained() const
         "S)_|::basic_string[a-zA-Z,<>: ]+::_M_create|::__|::_(Alloc|State)|"
         "std::(basic_|)(ifstream|ios|istream|ostream|stream))",
         regex_opts);
-    static std::regex leading("^(_|\\.|frame_dummy|transaction clone|virtual "
-                              "thunk|non-virtual thunk|\\(|targ|kmp_threadprivate_)",
-                              regex_opts);
+    static std::regex leading(
+        "^(_|\\.|frame_dummy|transaction clone|virtual "
+        "thunk|non-virtual thunk|\\(|targ|kmp_threadprivate_|Kokkos::Profiling::)",
+        regex_opts);
     static std::regex trailing(
         "(_|\\.part\\.[0-9]+|\\.constprop\\.[0-9]+|\\.|\\.[0-9]+)$", regex_opts);
     static strset_t whole = []() {