diff --git a/hw/rtl/VX_define.vh b/hw/rtl/VX_define.vh
index 0985840d..2bcae6a9 100644
--- a/hw/rtl/VX_define.vh
+++ b/hw/rtl/VX_define.vh
@@ -283,7 +283,7 @@
 `define VX_DRAM_LINE_WIDTH      `L3DRAM_LINE_WIDTH
 `define VX_DRAM_TAG_WIDTH       `L3DRAM_TAG_WIDTH
 `define VX_SNP_TAG_WIDTH        `L3SNP_TAG_WIDTH    
-`define VX_CORE_TAG_WIDTH       `DCORE_TAG_WIDTH 
+`define VX_CORE_TAG_WIDTH       `L3CORE_TAG_WIDTH 
 
 `define DRAM_TO_BYTE_ADDR(x)     {x, (32-$bits(x))'(0)}
 
diff --git a/hw/rtl/Vortex_Cluster.v b/hw/rtl/Vortex_Cluster.v
index f6e322c3..7237bc02 100644
--- a/hw/rtl/Vortex_Cluster.v
+++ b/hw/rtl/Vortex_Cluster.v
@@ -47,13 +47,13 @@ module Vortex_Cluster #(
     output wire [3:0]                       io_req_byteen,  
     output wire [29:0]                      io_req_addr,
     output wire [31:0]                      io_req_data,    
-    output wire [`DCORE_TAG_WIDTH-1:0]      io_req_tag,    
+    output wire [`L2CORE_TAG_WIDTH-1:0]     io_req_tag,    
     input wire                              io_req_ready,
 
     // I/O response
     input wire                              io_rsp_valid,
     input wire [31:0]                       io_rsp_data,
-    input wire [`DCORE_TAG_WIDTH-1:0]       io_rsp_tag,
+    input wire [`L2CORE_TAG_WIDTH-1:0]      io_rsp_tag,
     output wire                             io_rsp_ready,
 
     // Status
@@ -180,7 +180,7 @@ module Vortex_Cluster #(
     end     
 
     VX_mem_arb #(
-        .NUM_REQUESTS  (`NUM_CLUSTERS),
+        .NUM_REQUESTS  (`NUM_CORES),
         .WORD_SIZE     (4),
         .TAG_IN_WIDTH  (`DCORE_TAG_WIDTH),
         .TAG_OUT_WIDTH (`L2CORE_TAG_WIDTH)