diff --git a/hw/opae/sources.txt b/hw/opae/sources.txt
index 61e9488e..a6039389 100644
--- a/hw/opae/sources.txt
+++ b/hw/opae/sources.txt
@@ -46,7 +46,6 @@ vortex_afu.json
 ../rtl/cache/VX_cache_dfq_queue.v
 ../rtl/cache/VX_cache_req_queue.v
 ../rtl/cache/VX_cache_miss_resrv.v
-../rtl/cache/VX_fill_invalidator.v
 ../rtl/cache/VX_snp_rsp_arb.v
 ../rtl/cache/VX_tag_data_access.v
 ../rtl/cache/VX_tag_data_structure.v
diff --git a/hw/opae/vortex_afu.sv b/hw/opae/vortex_afu.sv
index a3e63aed..a27ed865 100644
--- a/hw/opae/vortex_afu.sv
+++ b/hw/opae/vortex_afu.sv
@@ -332,7 +332,7 @@ begin
               && avs_write_ctr < csr_data_size);
 
   cci_dram_req_read_fire = (state == STATE_READ) 
-                        && ((avs_pending_reads < AVS_RD_QUEUE_SIZE)
+                        && (avs_pending_reads < AVS_RD_QUEUE_SIZE)
                         && !avs_waitrequest 
                         && avs_read_ctr < csr_data_size;
 
diff --git a/hw/rtl/cache/VX_bank.v b/hw/rtl/cache/VX_bank.v
index 65d7b6dd..e4c05de1 100644
--- a/hw/rtl/cache/VX_bank.v
+++ b/hw/rtl/cache/VX_bank.v
@@ -245,6 +245,8 @@ module VX_bank #(
     wire[`LINE_ADDR_WIDTH-1:0]            addr_st2;
     wire                                  is_fill_st2;
 
+    wire                                  recover_mrvq_state_st2;
+
     wire mrvq_push_stall;
     wire cwbq_push_stall;    
     wire dwbq_push_stall;    
@@ -471,8 +473,7 @@ module VX_bank #(
     wire                            mrvq_init_ready_state_unqual_st2;
     wire                            mrvq_init_ready_state_hazard_st0_st1;
     wire                            mrvq_init_ready_state_hazard_st1e_st1;
-    wire                            recover_mrvq_state_st2;
-
+    
     VX_generic_register #(
         .N(1+ 1+ 1 + 1 + 1 + 1 + 1 + 1 + `LINE_ADDR_WIDTH + `BASE_ADDR_BITS + `WORD_WIDTH + `WORD_WIDTH + `BANK_LINE_WIDTH + `TAG_SELECT_BITS + 1 + 1 + `REQ_INST_META_WIDTH)
     ) st_1e_2 (
diff --git a/hw/rtl/cache/VX_cache.v b/hw/rtl/cache/VX_cache.v
index 2a4ac870..b060dc52 100644
--- a/hw/rtl/cache/VX_cache.v
+++ b/hw/rtl/cache/VX_cache.v
@@ -48,13 +48,13 @@ module VX_cache #(
     parameter PRFQ_STRIDE                   = 0,
 
     // core request tag size
-    parameter CORE_TAG_WIDTH                = 1,
+    parameter CORE_TAG_WIDTH                = 42,
 
     // size of tag id in core request tag
-    parameter CORE_TAG_ID_BITS              = 42,
+    parameter CORE_TAG_ID_BITS              = 8,
 
     // dram request tag size
-    parameter DRAM_TAG_WIDTH                = 8,
+    parameter DRAM_TAG_WIDTH                = 28,
 
     // Number of snoop forwarding requests
     parameter NUM_SNP_REQUESTS              = 2,