diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh
index f0910b2b..a5f61679 100644
--- a/hw/rtl/VX_config.vh
+++ b/hw/rtl/VX_config.vh
@@ -278,7 +278,7 @@
 
 // Size of LSU Request Queue
 `ifndef LSUQ_SIZE
-`define LSUQ_SIZE   (4 * `NUM_WARPS * (`NUM_THREADS / `NUM_LSU_LANES))
+`define LSUQ_SIZE   (8 * (`NUM_THREADS / `NUM_LSU_LANES))
 `endif
 
 // LSU Duplicate Address Check
diff --git a/hw/rtl/VX_platform.vh b/hw/rtl/VX_platform.vh
index 195c252f..64338e49 100644
--- a/hw/rtl/VX_platform.vh
+++ b/hw/rtl/VX_platform.vh
@@ -21,7 +21,7 @@
 `define DPI_DISABLE
 `else
 `define SV_DPI
-`endif
+`endif // SIMULATION
 
 `ifdef SYNTHESIS
 `define GPR_RESET
@@ -38,15 +38,7 @@
 `endif
 
 `define FIRESIM
-
-// synthesis only
-`ifndef SIMULATION
-`define SYNTHESIS
-`define NDEBUG
-`define DPI_DISABLE
-`else
-`define SV_DPI
-`endif
+`endif // SYNTHESIS
 
 `ifdef SV_DPI
 `include "util_dpi.vh"