diff --git a/fuzzers/041-clk-hrow-pips/clk_hrow_pip_list.tcl b/fuzzers/041-clk-hrow-pips/clk_hrow_pip_list.tcl
index 692ad20d..2679bd36 100644
--- a/fuzzers/041-clk-hrow-pips/clk_hrow_pip_list.tcl
+++ b/fuzzers/041-clk-hrow-pips/clk_hrow_pip_list.tcl
@@ -18,6 +18,11 @@ proc print_tile_pips {tile_type filename} {
                 continue
             }
 
+            # TODO: Support CLK sources from GTX hardblocks.
+            if [string match *GTX* $src_node] {
+                continue
+            }
+
             if {[llength [get_nodes -uphill -of_objects [get_nodes -of_objects $dst]]] != 1} {
                 set pip_string "$tile_type.[regsub {.*/} $dst ""].[regsub {.*/} $src ""]"
                 if ![dict exists $pips $pip_string] {
diff --git a/fuzzers/045-hclk-cmt-pips/top.py b/fuzzers/045-hclk-cmt-pips/top.py
index d623b9c1..0c740d01 100644
--- a/fuzzers/045-hclk-cmt-pips/top.py
+++ b/fuzzers/045-hclk-cmt-pips/top.py
@@ -107,14 +107,16 @@ def get_paired_iobs(db, grid, tile_name):
 
     if gridinfo.tile_type.endswith('_L'):
         inc = 1
+        lr = 'R'
     else:
         inc = -1
+        lr = 'L'
 
     idx = 1
     while True:
         gridinfo = grid.gridinfo_at_loc((loc.grid_x + inc * idx, loc.grid_y))
 
-        if gridinfo.tile_type == 'HCLK_IOI3':
+        if gridinfo.tile_type.startswith('HCLK_IOI'):
             break
 
         idx += 1
@@ -127,7 +129,8 @@ def get_paired_iobs(db, grid, tile_name):
         gridinfo = grid.gridinfo_at_loc(iob_loc)
         tile_name = grid.tilename_at_loc(iob_loc)
 
-        assert gridinfo.tile_type.endswith('IOB33')
+        assert gridinfo.tile_type.startswith(lr + 'IOB'), (
+            gridinfo, lr + 'IOB')
 
         for site, site_type in gridinfo.sites.items():
             if site_type == 'IOB33M':