diff --git a/rtl/ibex_controller.sv b/rtl/ibex_controller.sv
index fa6743ca..0ab73ebd 100644
--- a/rtl/ibex_controller.sv
+++ b/rtl/ibex_controller.sv
@@ -156,10 +156,10 @@ module ibex_controller (
 
     csr_save_cause_o       = 1'b0;
 
-    exc_cause_o            = '0;
+    exc_cause_o            = exc_cause_e'('0);
     exc_pc_mux_o           = EXC_PC_IRQ;
 
-    csr_cause_o            = '0;
+    csr_cause_o            = exc_cause_e'('0);
 
     pc_mux_o               = PC_BOOT;
     pc_set_o               = 1'b0;
diff --git a/rtl/ibex_cs_registers.sv b/rtl/ibex_cs_registers.sv
index 6e6992d2..518c2e2a 100644
--- a/rtl/ibex_cs_registers.sv
+++ b/rtl/ibex_cs_registers.sv
@@ -371,9 +371,11 @@ module ibex_cs_registers #(
       mcause_q   <= '0;
 
       depc_q      <= '0;
-      dcsr_q      <= '{
-        prv:     PRIV_LVL_M,
-        default: '0
+      dcsr_q     <= '{
+        xdebugver: x_debug_ver_e'('0),
+        cause:     dbg_cause_e'('0),
+        prv:       PRIV_LVL_M,
+        default:   '0
       };
       dscratch0_q <= '0;
       dscratch1_q <= '0;