diff --git a/src/ieu/bmu/bmuctrl.sv b/src/ieu/bmu/bmuctrl.sv
index 936986cf3..b09bec11b 100644
--- a/src/ieu/bmu/bmuctrl.sv
+++ b/src/ieu/bmu/bmuctrl.sv
@@ -84,11 +84,11 @@ module bmuctrl(
                                  BMUControlsD = `BMUCTRLW'b111_01_000_1_1_0_1_1_0_1_0_0;  // bclri
       17'b0010011_0100101_001: if (`XLEN == 64 & `ZBS_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b111_01_000_1_1_0_1_1_0_1_0_0;  // bclri (rv64)
-      17'b0010011_0100100_101: if (`ZBS_SUPPORTED & `ZBS_SUPPORTED)
+      17'b0010011_0100100_101: if (`ZBS_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b101_01_000_1_1_0_1_1_0_1_0_0;  // bexti
       17'b0010011_0100101_101: if (`XLEN == 64 & `ZBS_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b101_01_000_1_1_0_1_1_0_1_0_0;  // bexti (rv64)
-      17'b0010011_0110100_001: if (`ZBS_SUPPORTED & `ZBS_SUPPORTED)
+      17'b0010011_0110100_001: if (`ZBS_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b100_01_000_1_1_0_1_0_0_1_0_0;  // binvi
       17'b0010011_0110101_001: if (`XLEN == 64 & `ZBS_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b100_01_000_1_1_0_1_0_0_1_0_0;  // binvi (rv64)
@@ -141,13 +141,13 @@ module bmuctrl(
                                  BMUControlsD = `BMUCTRLW'b001_01_111_1_0_0_1_0_1_0_0_0;  // ror
       17'b0111011_0110000_101: if (`XLEN == 64 & `ZBB_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b001_00_111_1_0_1_1_0_1_0_0_0;  // rorw
-      17'b0010011_0110000_101: if (`ZBB_SUPPORTED)
-                                 BMUControlsD = `BMUCTRLW'b001_00_111_1_1_0_1_0_1_0_0_0;  // rori (rv32)
-      17'b0010011_0110001_101: if (`XLEN == 64 & `ZBB_SUPPORTED) 
+      //17'b0010011_0110000_101: if (`ZBB_SUPPORTED)
+      //                           BMUControlsD = `BMUCTRLW'b001_00_111_1_1_0_1_0_1_0_0_0;  // rori (rv32)
+      17'b0010011_011000?_101: if ((`XLEN == 64 | ~Funct7D[0]) & `ZBB_SUPPORTED) 
                                  BMUControlsD = `BMUCTRLW'b001_00_111_1_1_0_1_0_1_0_0_0;  // rori (rv64)
       17'b0011011_0110000_101: if (`XLEN == 64 & `ZBB_SUPPORTED) 
                                  BMUControlsD = `BMUCTRLW'b001_00_111_1_1_1_1_0_1_0_0_0;  // roriw 
-      17'b0010011_0110000_001: if (Rs2D[2] & `ZBB_SUPPORTED & (Rs2D[4:1] == 4'b0010))
+      17'b0010011_0110000_001: if (`ZBB_SUPPORTED & (Rs2D[4:1] == 4'b0010))
                                  BMUControlsD = `BMUCTRLW'b000_10_001_1_1_0_1_0_0_0_0_0;  // sign extend instruction
                                else if (`ZBB_SUPPORTED & ((Rs2D[4:2]==3'b000) & ~(Rs2D[1] & Rs2D[0])))
                                  BMUControlsD = `BMUCTRLW'b000_10_000_1_1_0_1_0_0_0_0_0;  // count instruction
@@ -163,16 +163,16 @@ module bmuctrl(
                                  BMUControlsD = `BMUCTRLW'b110_01_111_1_0_0_1_1_0_0_0_0;  // orn
       17'b0110011_0100000_100: if (`ZBB_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b100_01_111_1_0_0_1_1_0_0_0_0;  // xnor
-      17'b0010011_0110101_101: if (`XLEN == 64 & `ZBB_SUPPORTED & (Rs2D == 5'b11000))
-                                 BMUControlsD = `BMUCTRLW'b000_10_010_1_1_0_1_0_0_0_0_0;  // rev8 (rv64)
-      17'b0010011_0110100_101: if (`XLEN == 32 & `ZBB_SUPPORTED & (Rs2D == 5'b11000)) 
-                                 BMUControlsD = `BMUCTRLW'b000_10_010_1_1_0_1_0_0_0_0_0;  // rev8 (rv32)
+      17'b0010011_011010?_101: if ((`XLEN == 32 ^ Funct7D[0]) & `ZBB_SUPPORTED & (Rs2D == 5'b11000))
+                                 BMUControlsD = `BMUCTRLW'b000_10_010_1_1_0_1_0_0_0_0_0;  // rev8
+      //17'b0010011_0110100_101: if (`XLEN == 32 & `ZBB_SUPPORTED & (Rs2D == 5'b11000)) 
+      //                           BMUControlsD = `BMUCTRLW'b000_10_010_1_1_0_1_0_0_0_0_0;  // rev8 (rv32)
       17'b0010011_0010100_101: if (`ZBB_SUPPORTED & Rs2D[4:0] == 5'b00111)
                                  BMUControlsD = `BMUCTRLW'b000_10_010_1_1_0_1_0_0_0_0_0;  // orc.b
       17'b0110011_0000101_110: if (`ZBB_SUPPORTED)
-                                 BMUControlsD = `BMUCTRLW'b000_10_100_1_0_0_1_0_0_0_0_0;  // max
+                                 BMUControlsD = `BMUCTRLW'b000_10_111_1_0_0_1_0_0_0_0_0;  // max
       17'b0110011_0000101_111: if (`ZBB_SUPPORTED)
-                                 BMUControlsD = `BMUCTRLW'b000_10_100_1_0_0_1_0_0_0_0_0;  // maxu
+                                 BMUControlsD = `BMUCTRLW'b000_10_111_1_0_0_1_0_0_0_0_0;  // maxu
       17'b0110011_0000101_100: if (`ZBB_SUPPORTED)
                                  BMUControlsD = `BMUCTRLW'b000_10_011_1_0_0_1_0_0_0_0_0;  // min
       17'b0110011_0000101_101: if (`ZBB_SUPPORTED)
diff --git a/src/ieu/bmu/zbb.sv b/src/ieu/bmu/zbb.sv
index ddf96b113..89ae7beb4 100644
--- a/src/ieu/bmu/zbb.sv
+++ b/src/ieu/bmu/zbb.sv
@@ -39,17 +39,17 @@ module zbb #(parameter WIDTH=32) (
   output logic [WIDTH-1:0] ZBBResult);   // ZBB result
   
   logic [WIDTH-1:0] CntResult;           // count result
-  logic [WIDTH-1:0] MinResult,MaxResult; // min,max result
+  logic [WIDTH-1:0] MinResult,MaxResult, MinMaxResult; // min,max result
   logic [WIDTH-1:0] ByteResult;          // byte results
   logic [WIDTH-1:0] ExtResult;           // sign/zero extend results
 
-  cnt #(WIDTH) cnt(.A(A), .RevA(RevA), .B(B[4:0]), .W64(W64), .CntResult(CntResult));
-  byteUnit #(WIDTH) bu(.A(A), .ByteSelect(B[0]), .ByteResult(ByteResult));
-  ext #(WIDTH) ext(.A(A), .ExtSelect({~B[2], {B[2] & B[0]}}), .ExtResult(ExtResult));
+  cnt #(WIDTH) cnt(.A, .RevA, .B(B[4:0]), .W64, .CntResult);
+  byteUnit #(WIDTH) bu(.A, .ByteSelect(B[0]), .ByteResult);
+  ext #(WIDTH) ext(.A, .ExtSelect({~B[2], {B[2] & B[0]}}), .ExtResult);
 
-  mux2 #(WIDTH) maxmux(A, B, lt, MaxResult);
-  mux2 #(WIDTH) minmux(B, A, lt, MinResult);
+  // ZBBSelect[2] differentiates between min(u) vs max(u) instruction
+  mux2 #(WIDTH) minmaxmux(B, A, lt^ZBBSelect[2], MinMaxResult);
 
   // ZBB Result select mux
-  mux5 #(WIDTH) zbbresultmux(CntResult, ExtResult, ByteResult, MinResult, MaxResult, ZBBSelect, ZBBResult);
+  mux4 #(WIDTH) zbbresultmux(CntResult, ExtResult, ByteResult, MinMaxResult, ZBBSelect[1:0], ZBBResult);
 endmodule
\ No newline at end of file