diff --git a/projects/rocprofiler-compute/src/argparser.py b/projects/rocprofiler-compute/src/argparser.py
index 2df149f4a4..13d83a8f3c 100644
--- a/projects/rocprofiler-compute/src/argparser.py
+++ b/projects/rocprofiler-compute/src/argparser.py
@@ -33,6 +33,7 @@ def print_avail_arch(avail_arch: list):
         ret_str += "\n\t\t   {}".format(arch)
     return ret_str
 
+
 def add_general_group(parser, omniperf_version):
     general_group = parser.add_argument_group("General Options")
 
@@ -55,6 +56,7 @@ def add_general_group(parser, omniperf_version):
             "-s", "--specs", action="store_true", help="Print system specs."
         )
 
+
 def omniarg_parser(parser, omniperf_home, supported_archs, omniperf_version):
     # -----------------------------------------
     # Parse arguments (dependent on mode)
diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v1.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v1.py
index 0fd78a7d18..887fcff007 100644
--- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v1.py
+++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v1.py
@@ -26,7 +26,6 @@ import os
 
 from omniperf_profile.profiler_base import OmniProfiler_Base
 from utils.utils import demarcate, replace_timestamps, console_log
-from utils.kernel_name_shortener import kernel_name_shortener
 
 
 class rocprof_v1_profiler(OmniProfiler_Base):
diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v2.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v2.py
index c3c6c8ba39..9a41335035 100644
--- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v2.py
+++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_rocprof_v2.py
@@ -24,8 +24,7 @@
 
 import os
 from omniperf_profile.profiler_base import OmniProfiler_Base
-from utils.utils import demarcate, console_log
-from utils.kernel_name_shortener import kernel_name_shortener
+from utils.utils import demarcate, console_log, replace_timestamps
 
 
 class rocprof_v2_profiler(OmniProfiler_Base):
@@ -81,5 +80,7 @@ class rocprof_v2_profiler(OmniProfiler_Base):
         super().post_processing()
 
         if self.ready_to_profile:
-            # Pass headers to join on
+            # Manually join each pmc_perf*.csv output
             self.join_prof()
+            # Replace timestamp data to solve a known rocprof bug
+            replace_timestamps(self.get_args().path)