diff --git a/hw/rtl/VX_instr_demux.v b/hw/rtl/VX_instr_demux.v
index 36164b94..85f0bbf5 100644
--- a/hw/rtl/VX_instr_demux.v
+++ b/hw/rtl/VX_instr_demux.v
@@ -38,7 +38,8 @@ module VX_instr_demux (
     wire alu_req_valid = execute_if.valid && (execute_if.ex_type == `EX_ALU);
     
     VX_skid_buffer #(
-        .DATAW (`NW_BITS + `NUM_THREADS + 32 + 32 + `ALU_BITS + `MOD_BITS + 32 + 1 + 1 + `NR_BITS + 1 + `NT_BITS + (2 * `NUM_THREADS * 32))
+        .DATAW (`NW_BITS + `NUM_THREADS + 32 + 32 + `ALU_BITS + `MOD_BITS + 32 + 1 + 1 + `NR_BITS + 1 + `NT_BITS + (2 * `NUM_THREADS * 32)),
+        .BUFFERED (1)
     ) alu_buffer (
         .clk       (clk),
         .reset     (reset),
@@ -55,7 +56,8 @@ module VX_instr_demux (
     wire lsu_req_valid = execute_if.valid && (execute_if.ex_type == `EX_LSU);
 
     VX_skid_buffer #(
-        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `LSU_BITS + 32 + `NR_BITS + 1 + (2 * `NUM_THREADS * 32))
+        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `LSU_BITS + 32 + `NR_BITS + 1 + (2 * `NUM_THREADS * 32)),
+        .BUFFERED (1)
     ) lsu_buffer (
         .clk       (clk),
         .reset     (reset),
@@ -72,7 +74,8 @@ module VX_instr_demux (
     wire csr_req_valid = execute_if.valid && (execute_if.ex_type == `EX_CSR);
 
     VX_skid_buffer #(
-        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `CSR_BITS + `CSR_ADDR_BITS + `NR_BITS + 1 + 1 + `NR_BITS + 32)
+        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `CSR_BITS + `CSR_ADDR_BITS + `NR_BITS + 1 + 1 + `NR_BITS + 32),
+        .BUFFERED (1)
     ) csr_buffer (
         .clk       (clk),
         .reset     (reset),
@@ -90,7 +93,8 @@ module VX_instr_demux (
     wire fpu_req_valid = execute_if.valid && (execute_if.ex_type == `EX_FPU);
     
     VX_skid_buffer #(
-        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `FPU_BITS + `MOD_BITS + `NR_BITS + 1 + (3 * `NUM_THREADS * 32))
+        .DATAW (`NW_BITS + `NUM_THREADS + 32 + `FPU_BITS + `MOD_BITS + `NR_BITS + 1 + (3 * `NUM_THREADS * 32)),
+        .BUFFERED (1)
     ) fpu_buffer (
         .clk       (clk),
         .reset     (reset),
@@ -111,7 +115,8 @@ module VX_instr_demux (
     wire gpu_req_valid = execute_if.valid && (execute_if.ex_type == `EX_GPU);
 
     VX_skid_buffer #(
-        .DATAW (`NW_BITS + `NUM_THREADS + 32 + 32 + `GPU_BITS + `NR_BITS + 1 + (`NUM_THREADS * 32 + 32))
+        .DATAW (`NW_BITS + `NUM_THREADS + 32 + 32 + `GPU_BITS + `NR_BITS + 1 + (`NUM_THREADS * 32 + 32)),
+        .BUFFERED (1)
     ) gpu_buffer (
         .clk       (clk),
         .reset     (reset),