diff --git a/src/axi_xbar.sv b/src/axi_xbar.sv
index 95b27ff2c..52769a66c 100644
--- a/src/axi_xbar.sv
+++ b/src/axi_xbar.sv
@@ -249,14 +249,14 @@ import cf_math_pkg::idx_width;
     for (genvar j = 0; j < Cfg.NoMstPorts; j++) begin : gen_xbar_mst_cross
       if (Connectivity[i][j]) begin : gen_connection
         axi_multicut #(
-          .NoCuts    ( Cfg.PipelineStages ),
-          .aw_chan_t ( slv_aw_chan_t      ),
-          .w_chan_t  ( w_chan_t           ),
-          .b_chan_t  ( slv_b_chan_t       ),
-          .ar_chan_t ( slv_ar_chan_t      ),
-          .r_chan_t  ( slv_r_chan_t       ),
-          .req_t     ( slv_req_t          ),
-          .resp_t    ( slv_resp_t         )
+          .NoCuts     ( Cfg.PipelineStages ),
+          .aw_chan_t  ( slv_aw_chan_t      ),
+          .w_chan_t   ( w_chan_t           ),
+          .b_chan_t   ( slv_b_chan_t       ),
+          .ar_chan_t  ( slv_ar_chan_t      ),
+          .r_chan_t   ( slv_r_chan_t       ),
+          .axi_req_t  ( slv_req_t          ),
+          .axi_resp_t ( slv_resp_t         )
         ) i_axi_multicut_xbar_pipeline (
           .clk_i,
           .rst_ni,
diff --git a/test/tb_axi_xbar.sv b/test/tb_axi_xbar.sv
index d83db6e73..b182e9185 100644
--- a/test/tb_axi_xbar.sv
+++ b/test/tb_axi_xbar.sv
@@ -223,12 +223,12 @@ module tb_axi_xbar #(
                                       axi_pkg::DEVICE_NONBUFFERABLE);
       axi_rand_master[i].reset();
       @(posedge rst_n);
-      axi_rand_master.run(TbNumReads, TbNumWrites);
+      axi_rand_master[i].run(TbNumReads, TbNumWrites);
       end_of_sim[i] <= 1'b1;
     end
   end
 
-  axi_rand_slave_t axi_rand_slave [TbNumSlv];
+  axi_rand_slave_t axi_rand_slave [TbNumSlaves];
   for (genvar i = 0; i < TbNumSlaves; i++) begin : gen_rand_slave
     initial begin
       axi_rand_slave[i] = new( slave_dv[i] );