diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh
index 2a63b73d..b3a1081f 100644
--- a/hw/rtl/VX_config.vh
+++ b/hw/rtl/VX_config.vh
@@ -55,6 +55,10 @@
 `define SHARED_MEM_BASE_ADDR `IO_BUS_BASE_ADDR
 `endif
 
+`ifndef SHARED_MEM_BASE_ADDR_ALIGN
+`define SHARED_MEM_BASE_ADDR_ALIGN 64
+`endif
+
 `ifndef IO_BUS_ADDR_COUT
 `define IO_BUS_ADDR_COUT 32'hFFFFFFFC
 `endif
diff --git a/hw/rtl/VX_databus_arb.v b/hw/rtl/VX_databus_arb.v
index ac7e3ff5..329cd4fd 100644
--- a/hw/rtl/VX_databus_arb.v
+++ b/hw/rtl/VX_databus_arb.v
@@ -18,9 +18,11 @@ module VX_databus_arb (
     // output response
     VX_cache_core_rsp_if    core_rsp_if
 );
-    localparam REQ_ADDRW = 32 - `CLOG2(`DWORD_SIZE);
-    localparam REQ_DATAW = REQ_ADDRW + 1 + `DWORD_SIZE + (`DWORD_SIZE*8) + `DCORE_TAG_WIDTH;
-    localparam RSP_DATAW = `NUM_THREADS + `NUM_THREADS * (`DWORD_SIZE*8) + `DCORE_TAG_WIDTH;
+    localparam SMEM_ASHIFT = `CLOG2(`SHARED_MEM_BASE_ADDR_ALIGN);    
+    localparam REQ_ASHIFT  = `CLOG2(`DWORD_SIZE);
+    localparam REQ_ADDRW   = 32 - REQ_ASHIFT;
+    localparam REQ_DATAW   = REQ_ADDRW + 1 + `DWORD_SIZE + (`DWORD_SIZE*8) + `DCORE_TAG_WIDTH;
+    localparam RSP_DATAW   = `NUM_THREADS + `NUM_THREADS * (`DWORD_SIZE*8) + `DCORE_TAG_WIDTH;
 
     //
     // handle requests
@@ -33,8 +35,8 @@ module VX_databus_arb (
 
         // select shared memory bus
         wire is_smem_addr = core_req_if.valid[i] && `SM_ENABLE
-                         && (core_req_if.addr[i] >= REQ_ADDRW'((`SHARED_MEM_BASE_ADDR - `SMEM_SIZE) >> 2))
-                         && (core_req_if.addr[i] < REQ_ADDRW'(`SHARED_MEM_BASE_ADDR >> 2));
+                         && (core_req_if.addr[i][REQ_ADDRW-1:SMEM_ASHIFT-REQ_ASHIFT] >= (32-SMEM_ASHIFT)'((`SHARED_MEM_BASE_ADDR - `SMEM_SIZE) >> SMEM_ASHIFT))
+                         && (core_req_if.addr[i][REQ_ADDRW-1:SMEM_ASHIFT-REQ_ASHIFT] < (32-SMEM_ASHIFT)'(`SHARED_MEM_BASE_ADDR >> SMEM_ASHIFT));
 
         VX_skid_buffer #(
             .DATAW (REQ_DATAW)
diff --git a/hw/rtl/VX_lsu_unit.v b/hw/rtl/VX_lsu_unit.v
index ef2f56d0..9aa3fb80 100644
--- a/hw/rtl/VX_lsu_unit.v
+++ b/hw/rtl/VX_lsu_unit.v
@@ -77,8 +77,7 @@ module VX_lsu_unit #(
 
     VX_pipe_register #(
         .DATAW  (1 + `NW_BITS + `NUM_THREADS + 32 + 1 + `NR_BITS + 1 + (`NUM_THREADS * 32) + 2 + (`NUM_THREADS * (30 + 2 + 4 + 32))),
-        .RESETW (1),
-        .DEPTH  (0)
+        .RESETW (1)
     ) req_pipe_reg (
         .clk      (clk),
         .reset    (reset),