diff --git a/core/decoder.sv b/core/decoder.sv
index 03f44f0ca8..65e7c22450 100644
--- a/core/decoder.sv
+++ b/core/decoder.sv
@@ -121,7 +121,6 @@ module decoder
   logic [CVA6Cfg.XLEN-1:0] imm_sb_type;
   logic [CVA6Cfg.XLEN-1:0] imm_u_type;
   logic [CVA6Cfg.XLEN-1:0] imm_uj_type;
-  logic [CVA6Cfg.XLEN-1:0] imm_bi_type;
 
   // ---------------------------------------
   // Accelerator instructions' first-pass decoder
@@ -179,7 +178,6 @@ module decoder
     instruction_o.use_zimm                 = 1'b0;
     instruction_o.bp                       = branch_predict_i;
     instruction_o.vfp                      = 1'b0;
-    tinst                                  = '0;
     ecall                                  = 1'b0;
     ebreak                                 = 1'b0;
     check_fprm                             = 1'b0;
@@ -1351,16 +1349,18 @@ module decoder
           end else begin
             illegal_instr = 1'b1;
           end
-          tinst = {
-            instr.atype.funct5,
-            instr.atype.aq,
-            instr.atype.rl,
-            instr.atype.rs2,
-            5'b0,
-            instr.atype.funct3,
-            instr.atype.rd,
-            instr.atype.opcode
-          };
+          if (CVA6Cfg.RVH) begin
+            tinst = {
+              instr.atype.funct5,
+              instr.atype.aq,
+              instr.atype.rl,
+              instr.atype.rs2,
+              5'b0,
+              instr.atype.funct3,
+              instr.atype.rd,
+              instr.atype.opcode
+            };
+          end
         end
 
         // --------------------------------
@@ -1478,9 +1478,8 @@ module decoder
       instruction_i[30:21],
       1'b0
     };
-    imm_bi_type = {{CVA6Cfg.XLEN - 5{instruction_i[24]}}, instruction_i[24:20]};
 
-    // NOIMM, IIMM, SIMM, BIMM, UIMM, JIMM, RS3
+    // NOIMM, IIMM, SIMM, SBIMM, UIMM, JIMM, RS3
     // select immediate
     case (imm_select)
       IIMM: begin
diff --git a/spyglass/reference_summary.rpt b/spyglass/reference_summary.rpt
index 81fb48d44b..8cd2eeaab5 100644
--- a/spyglass/reference_summary.rpt
+++ b/spyglass/reference_summary.rpt
@@ -4,8 +4,7 @@
 # This file has been generated by SpyGlass:
 #     Report Name      : summary
 #     Report Created by: asintzoff
-#     Report Created on:  Wed Aug 14 07:46:49 2024
-#     Report Created on:  Wed Aug 14 15:02:57 2024
+#     Report Created on:  Mon Sep  9 16:12:42 2024
 #     Working Directory: /home/asintzoff/git-repo/tss/cva6/spyglass
 #     SpyGlass Version : SpyGlass_vS-2021.09-SP2-3
 #     Policy Name      : SpyGlass(SpyGlass_vS-2021.09-SP2-03)
@@ -18,9 +17,9 @@
 #                        starc(SpyGlass_vS-2021.09-SP2-03)
 #                        starc2005(SpyGlass_vS-2021.09-SP2-03)
 #
-#     Total Number of Generated Messages :       1021
-#     Number of Waived Messages          :        322
-#     Number of Reported Messages        :        699
+#     Total Number of Generated Messages :       1023
+#     Number of Waived Messages          :        327
+#     Number of Reported Messages        :        696
 #     Number of Overlimit Messages       :          0
 #
 #
@@ -82,7 +81,7 @@ INFO       ElabSummary          1     Generates Elaborated design units
 Severity   Rule Name            Count Short Help                               
 ===============================================================================
 ERROR      InferLatch           2     Latch inferred 
-ERROR      UndrivenInTerm-ML    3     Undriven but loaded input terminal of 
+ERROR      UndrivenInTerm-ML    1     Undriven but loaded input terminal of 
                                       an instance detected 
 ERROR      W123                 11    A signal or variable has been read but 
                                       is not set 
@@ -118,7 +117,7 @@ WARNING    W415a                45    Signal may be multiply assigned (beside
                                       initialization) in the same scope. 
 WARNING    W480                 3     Loop index is not of type integer 
 WARNING    W486                 2     Shift overflow - some bits may be lost 
-WARNING    W528                 483   A signal or variable is set but never 
+WARNING    W528                 482   A signal or variable is set but never 
                                       read 
 INFO       W528                 1     A signal or variable is set but never 
                                       read