diff --git a/dv/uvm/core_ibex/common/ibex_mem_intf_agent/ibex_mem_intf.sv b/dv/uvm/core_ibex/common/ibex_mem_intf_agent/ibex_mem_intf.sv
index 53ccc62c..220a263a 100644
--- a/dv/uvm/core_ibex/common/ibex_mem_intf_agent/ibex_mem_intf.sv
+++ b/dv/uvm/core_ibex/common/ibex_mem_intf_agent/ibex_mem_intf.sv
@@ -9,16 +9,16 @@ interface ibex_mem_intf#(
   input clk
 );
 
-  logic                    reset;
-  logic                    request;
-  logic                    grant;
-  logic [ADDR_WIDTH-1:0]   addr;
-  logic                    we;
-  logic [DATA_WIDTH/8-1:0] be;
-  logic                    rvalid;
-  logic [DATA_WIDTH-1:0]   wdata;
-  logic [DATA_WIDTH-1:0]   rdata;
-  logic                    error;
+  wire                     reset;
+  wire                     request;
+  wire                     grant;
+  wire  [ADDR_WIDTH-1:0]   addr;
+  wire                     we;
+  wire  [DATA_WIDTH/8-1:0] be;
+  wire                     rvalid;
+  wire  [DATA_WIDTH-1:0]   wdata;
+  wire  [DATA_WIDTH-1:0]   rdata;
+  wire                     error;
 
   clocking request_driver_cb @(posedge clk);
     input   reset;
diff --git a/dv/uvm/core_ibex/yaml/rtl_simulation.yaml b/dv/uvm/core_ibex/yaml/rtl_simulation.yaml
index 6417f497..af520583 100644
--- a/dv/uvm/core_ibex/yaml/rtl_simulation.yaml
+++ b/dv/uvm/core_ibex/yaml/rtl_simulation.yaml
@@ -137,6 +137,7 @@
               -q
               -f ibex_dv.f
               -sv
+              -licqueue
               -uvm
               -uvmhome CDNS-1.2
               -define UVM_REGEX_NO_DPI
@@ -153,6 +154,7 @@
            -R
            -xmlibdirpath <out>
            -l <sim_dir>/sim.log
+           -licqueue
            -svseed <seed>
            -svrnc rand_struct
            +UVM_TESTNAME=<rtl_test>
@@ -163,5 +165,5 @@
            <wave_opts>
     wave_opts: >
       -input @"database -open <sim_dir>/waves -shm -default"
-      -input @"probe -create -all -depth all"
+      -input @"probe -create core_ibex_tb_top -all -depth all -variables"
       -input @"run"
diff --git a/rtl/ibex_cs_registers.sv b/rtl/ibex_cs_registers.sv
index 83b6a633..e0d075dd 100644
--- a/rtl/ibex_cs_registers.sv
+++ b/rtl/ibex_cs_registers.sv
@@ -1285,7 +1285,9 @@ module ibex_cs_registers #(
 
     // Assign read data
     // TSELECT - number of supported triggers defined by parameter DbgHwBreakNum
-    assign tselect_rdata = {'b0, tselect_q};
+    localparam int unsigned TSelectRdataPadlen = DbgHwNumLen >= 32 ? 0 : (32 - DbgHwNumLen);
+    assign tselect_rdata = {{TSelectRdataPadlen{1'b0}}, tselect_q};
+
     // TDATA0 - only support simple address matching
     assign tmatch_control_rdata = {4'h2,                         // type    : address/data match
                                    1'b1,                         // dmode   : access from D mode only