diff --git a/src/vsrc/defines.sv b/src/vsrc/defines.sv
index db1eee4..c5a88ed 100644
--- a/src/vsrc/defines.sv
+++ b/src/vsrc/defines.sv
@@ -143,7 +143,7 @@
 `define EXE_XOR_OP 8'b00000011
 `define EXE_NOR_OP 8'b00000100
 `define EXE_LUI_OP 8'b00000101
-`define EXE_SLL_OP 8'b00110001 // HACK: Workaround
+`define EXE_SLL_OP 8'b10110001 // HACK: Workaround
 `define EXE_SRL_OP 8'b00000110
 `define EXE_SRA_OP 8'b00000111
 `define EXE_ADD_OP 8'b00001000
diff --git a/src/vsrc/frontend/ftq.sv b/src/vsrc/frontend/ftq.sv
index 240eb1b..4fea13c 100644
--- a/src/vsrc/frontend/ftq.sv
+++ b/src/vsrc/frontend/ftq.sv
@@ -87,7 +87,7 @@ module ftq
         next_FTQ = FTQ;
         // clear out if committed
         for (integer i = 0; i < COMMIT_WIDTH; i++) begin
-            if (i < backend_commit_num) next_FTQ[comm_ptr+i] = 0;
+            if (i < backend_commit_num) next_FTQ[$clog2(QUEUE_SIZE)'(comm_ptr+i)] = 0;
         end
         // Accept BPU input
         if (bpu_i.valid) next_FTQ[bpu_ptr] = bpu_i;