diff --git a/projects/rocprofiler-compute/src/omniperf_cli/utils/parser.py b/projects/rocprofiler-compute/src/omniperf_cli/utils/parser.py
index de416ac174..f3635007f8 100644
--- a/projects/rocprofiler-compute/src/omniperf_cli/utils/parser.py
+++ b/projects/rocprofiler-compute/src/omniperf_cli/utils/parser.py
@@ -485,6 +485,12 @@ def eval_metric(dfs, dfs_type, sys_info, soc_spec, raw_pmc_df, debug):
         # NB: assume all build in vars from pmc_perf.csv for now
         s = build_eval_string(value, schema.pmc_perf_file_prefix)
         try:
+            print(s)
+            print("ammolite__maxWavesPerCU: ", ammolite__maxWavesPerCU)
+            print("ammolite__numCU: ", ammolite__numCU);
+            print(raw_pmc_df.get('pmc_perf').get("GRBM_GUI_ACTIVE"))
+            #if raw_pmc_df.get('pmc_perf').get("GRBM_GUI_ACTIVE") == 0:
+            #    raw_cmd_df.get('pmc_perf').set("GRBM_GUI_ACTIVE", 0)
             ammolite__build_in[key] = eval(compile(s, "<string>", "eval"))
         except TypeError:
             ammolite__build_in[key] = None
diff --git a/projects/rocprofiler-compute/src/perfmon_pub/metrics.xml b/projects/rocprofiler-compute/src/perfmon_pub/metrics.xml
index f22b2533b3..cddbad9fb5 100644
--- a/projects/rocprofiler-compute/src/perfmon_pub/metrics.xml
+++ b/projects/rocprofiler-compute/src/perfmon_pub/metrics.xml
@@ -23,7 +23,7 @@
   <metric name="WRITE_REQ_32B" expr=TCC_MC_WRREQ_sum descr="The total number of 32-byte effective memory writes."></metric>
 </gfx8_expr>
 
-<gfx900_expr>
+<gfx9_expr>
   <metric name="TA_BUSY_avr" expr=avr(TA_TA_BUSY,16) descr="TA block is busy. Average over TA instances."></metric>
   <metric name="TA_BUSY_max" expr=max(TA_TA_BUSY,16) descr="TA block is busy. Max over TA instances."></metric>
   <metric name="TA_BUSY_min" expr=min(TA_TA_BUSY,16) descr="TA block is busy. Min over TA instances."></metric>
@@ -198,7 +198,7 @@
   #<metric name="TCP_TCC_RW_WRITE_REQ_sum"                               expr=sum(TCP_TCC_RW_WRITE_REQ,16) descr="."></metric>
   #<metric name="TCP_TCC_RW_ATOMIC_REQ_sum"                              expr=sum(TCP_TCC_RW_ATOMIC_REQ,16) descr="."></metric>
 
-</gfx900_expr>
+</gfx9_expr>
 
 <gfx906_expr base="gfx9_expr">
   # EA1