diff --git a/Bender.yml b/Bender.yml
index c2c92e77ea..c21ec54dc8 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -153,7 +153,6 @@ sources:
       - core/perf_counters.sv
       - core/ariane_regfile_ff.sv
       - core/ariane_regfile_fpga.sv
-      - core/re_name.sv
       # NOTE: scoreboard.sv modified for DSIM (unchanged for other simulators)
       - core/scoreboard.sv
       - core/store_buffer.sv
diff --git a/core/include/cv64a6_imafdcv_sv39_config_pkg.sv b/core/include/cv64a6_imafdcv_sv39_config_pkg.sv
index dc505c8a67..7fdefb6f1a 100644
--- a/core/include/cv64a6_imafdcv_sv39_config_pkg.sv
+++ b/core/include/cv64a6_imafdcv_sv39_config_pkg.sv
@@ -93,7 +93,7 @@ package cva6_config_pkg;
       RVZCB: bit'(CVA6ConfigZcbExtEn),
       XFVec: bit'(CVA6ConfigFVecEn),
       CvxifEn: bit'(CVA6ConfigCvxifEn),
-      ZiCondExtEn: bit'(CVA6ConfigZiCondExtEn),
+      ZiCondExtEn: bit'(0),
       // Extended
       RVF: bit'(0),
       RVD: bit'(0),