diff --git a/hw/rtl/VX_gpr_ram.v b/hw/rtl/VX_gpr_ram.v
index 92a3128f..d30b6a91 100644
--- a/hw/rtl/VX_gpr_ram.v
+++ b/hw/rtl/VX_gpr_ram.v
@@ -21,7 +21,7 @@ module VX_gpr_ram (
     `ifndef ASIC            
         `UNUSED_VAR(reset)
 
-        reg [`NUM_THREADS-1:0][31:0] ram[31:0];       
+        reg [`NUM_THREADS-1:0][3:0][7:0] ram[31:0];
 
         wire [4:0] waddr = writeback_if.rd;
         wire [`NUM_THREADS-1:0][31:0] wdata = writeback_if.data;
@@ -30,8 +30,8 @@ module VX_gpr_ram (
         for (i = 0; i < `NUM_THREADS; i++) begin
             always @(posedge clk) begin
                 if (write_enable[i]) begin
-                    ram[waddr][i][0] <= wdata[i][7:0];
-                    ram[waddr][i][1] <= wdata[i][15:8];
+                    ram[waddr][i][0] <= wdata[i][07:00];
+                    ram[waddr][i][1] <= wdata[i][15:08];
                     ram[waddr][i][2] <= wdata[i][23:16];
                     ram[waddr][i][3] <= wdata[i][31:24];
                 end
diff --git a/hw/rtl/libs/VX_generic_queue.v b/hw/rtl/libs/VX_generic_queue.v
index 52e12831..0c1fb742 100644
--- a/hw/rtl/libs/VX_generic_queue.v
+++ b/hw/rtl/libs/VX_generic_queue.v
@@ -3,7 +3,7 @@
 module VX_generic_queue #(
     parameter DATAW,
     parameter SIZE = 16,
-    parameter BUFFERED_OUTPUT = 1
+    parameter BUFFERED_OUTPUT = (SIZE > 8)
 ) ( 
     input  wire             clk,
     input  wire             reset,
diff --git a/hw/syn/quartus/cache/Makefile b/hw/syn/quartus/cache/Makefile
index f1f1f511..8c69066f 100755
--- a/hw/syn/quartus/cache/Makefile
+++ b/hw/syn/quartus/cache/Makefile
@@ -67,4 +67,4 @@ program: $(PROJECT).sof
 	quartus_pgm --no_banner --mode=jtag -o "$(PROJECT).sof"
 	
 clean:
-	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws smart.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
+	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws *.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
diff --git a/hw/syn/quartus/pipeline/Makefile b/hw/syn/quartus/pipeline/Makefile
index 1a25f44c..b2ed2d5e 100644
--- a/hw/syn/quartus/pipeline/Makefile
+++ b/hw/syn/quartus/pipeline/Makefile
@@ -67,4 +67,4 @@ program: $(PROJECT).sof
 	quartus_pgm --no_banner --mode=jtag -o "$(PROJECT).sof"
 	
 clean:
-	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws smart.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
+	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws *.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
diff --git a/hw/syn/quartus/top/Makefile b/hw/syn/quartus/top/Makefile
index c665c80d..dbb4844f 100644
--- a/hw/syn/quartus/top/Makefile
+++ b/hw/syn/quartus/top/Makefile
@@ -67,4 +67,4 @@ program: $(PROJECT).sof
 	quartus_pgm --no_banner --mode=jtag -o "$(PROJECT).sof"
 	
 clean:
-	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws smart.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
+	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws *.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
diff --git a/hw/syn/quartus/vortex/Makefile b/hw/syn/quartus/vortex/Makefile
index c566ee4e..4e9badb1 100644
--- a/hw/syn/quartus/vortex/Makefile
+++ b/hw/syn/quartus/vortex/Makefile
@@ -67,4 +67,4 @@ program: $(PROJECT).sof
 	quartus_pgm --no_banner --mode=jtag -o "$(PROJECT).sof"
 	
 clean:
-	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws smart.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox
+	rm -rf bin *.rpt *.chg *.qsf *.qpf *.qws *.log *.htm *.eqn *.pin *.sof *.pof qdb incremental_db tmp-clearbox