diff --git a/fuzzers/015-clbnffmux/Makefile b/fuzzers/015-clbnffmux/Makefile
index f8fedf89..8c74d1ae 100644
--- a/fuzzers/015-clbnffmux/Makefile
+++ b/fuzzers/015-clbnffmux/Makefile
@@ -10,7 +10,7 @@ pushdb:
 	${XRAY_MERGEDB} clbll_r seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_l seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_r seg_clblx.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/016-clbnoutmux/Makefile b/fuzzers/016-clbnoutmux/Makefile
index b4d9daa1..edc58e2e 100644
--- a/fuzzers/016-clbnoutmux/Makefile
+++ b/fuzzers/016-clbnoutmux/Makefile
@@ -10,7 +10,7 @@ pushdb:
 	${XRAY_MERGEDB} clbll_r seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_l seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_r seg_clblx.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/017-clbprecyinit/Makefile b/fuzzers/017-clbprecyinit/Makefile
index f8fedf89..8c74d1ae 100644
--- a/fuzzers/017-clbprecyinit/Makefile
+++ b/fuzzers/017-clbprecyinit/Makefile
@@ -10,7 +10,7 @@ pushdb:
 	${XRAY_MERGEDB} clbll_r seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_l seg_clblx.segbits
 	${XRAY_MERGEDB} clblm_r seg_clblx.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile
index 171d2998..2570d491 100644
--- a/fuzzers/050-intpips/Makefile
+++ b/fuzzers/050-intpips/Makefile
@@ -18,7 +18,7 @@ pushdb:
 	${XRAY_MERGEDB} mask_clbll_r mask_clbll_r.segbits
 	${XRAY_MERGEDB} mask_clblm_l mask_clblm_l.segbits
 	${XRAY_MERGEDB} mask_clblm_r mask_clblm_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-imuxlout/Makefile
index 10161520..a2704db4 100644
--- a/fuzzers/051-imuxlout/Makefile
+++ b/fuzzers/051-imuxlout/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-clkin/Makefile
index a0f9a3eb..848e0de4 100644
--- a/fuzzers/052-clkin/Makefile
+++ b/fuzzers/052-clkin/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-ctrlin/Makefile
index a0f9a3eb..848e0de4 100644
--- a/fuzzers/053-ctrlin/Makefile
+++ b/fuzzers/053-ctrlin/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-gfan/Makefile
index a0f9a3eb..848e0de4 100644
--- a/fuzzers/054-gfan/Makefile
+++ b/fuzzers/054-gfan/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-gnd/Makefile
index c7a87af2..611626f7 100644
--- a/fuzzers/055-gnd/Makefile
+++ b/fuzzers/055-gnd/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile
index f6e68065..daf82238 100644
--- a/fuzzers/056-rempips/Makefile
+++ b/fuzzers/056-rempips/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-bipips/Makefile
index efbdfd07..e5fd419b 100644
--- a/fuzzers/057-bipips/Makefile
+++ b/fuzzers/057-bipips/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
 	${XRAY_MERGEDB} int_r seg_int_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK): todo.txt
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile
index df6a8fd4..59cdcdd5 100644
--- a/fuzzers/058-hclkpips/Makefile
+++ b/fuzzers/058-hclkpips/Makefile
@@ -18,7 +18,7 @@ pushdb:
 	${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.segbits
 	cp ppips_hclk_l.txt  ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_l.db
 	cp ppips_hclk_r.txt  ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_r.db
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/fuzzers/100-dsp-mskpat/Makefile b/fuzzers/100-dsp-mskpat/Makefile
index 42c02da0..18c24803 100644
--- a/fuzzers/100-dsp-mskpat/Makefile
+++ b/fuzzers/100-dsp-mskpat/Makefile
@@ -10,7 +10,7 @@ database: $(SPECIMENS_OK)
 pushdb:
 	${XRAY_MERGEDB} dsp_l seg_dsp_l.segbits
 	${XRAY_MERGEDB} dsp_r seg_dsp_r.segbits
-	${XRAY_DBFIXUP}
+	${XRAY_DBFIXUP} --clb-int
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)