diff --git a/wally-pipelined/src/fpu/fpu.sv b/wally-pipelined/src/fpu/fpu.sv
index e303f2055..0a2de521d 100755
--- a/wally-pipelined/src/fpu/fpu.sv
+++ b/wally-pipelined/src/fpu/fpu.sv
@@ -237,7 +237,7 @@ module fpu (
    logic fpdivClk;
    
    clockgater fpdivclkg(.E(FDivStartE),
-			.SE(DivBusyM),
+			.SE(1'b0),
 			.CLK(clk),
 			.ECLK(fpdivClk));
    
diff --git a/wally-pipelined/src/generic/clockgater.sv b/wally-pipelined/src/generic/clockgater.sv
index c06a1cbdc..f54e1e3d1 100644
--- a/wally-pipelined/src/generic/clockgater.sv
+++ b/wally-pipelined/src/generic/clockgater.sv
@@ -38,8 +38,10 @@ module clockgater
   logic 	enable_q;
   
 
-  always @(~CLK) begin
-    enable_q <= E | SE;
+  always_latch begin
+    if(~CLK) begin
+      enable_q <= E | SE;
+    end
   end
   assign ECLK = enable_q & CLK;
 
diff --git a/wally-pipelined/src/ifu/globalHistoryPredictor.sv b/wally-pipelined/src/ifu/globalHistoryPredictor.sv
index 516de633e..16964bd87 100644
--- a/wally-pipelined/src/ifu/globalHistoryPredictor.sv
+++ b/wally-pipelined/src/ifu/globalHistoryPredictor.sv
@@ -53,6 +53,8 @@ module globalHistoryPredictor
   logic 		   BPClassWrongNonCFI;
   logic 		   BPClassWrongCFI;
   logic 		   BPClassRightNonCFI;
+  logic 		   BPClassRightBPWrong;
+  logic 		   BPClassRightBPRight;
 
   logic [6:0] 		   GHRMuxSel;
   logic 		   GHRUpdateEN;
diff --git a/wally-pipelined/src/ifu/gsharePredictor.sv b/wally-pipelined/src/ifu/gsharePredictor.sv
index b4a608278..36e54d4bb 100644
--- a/wally-pipelined/src/ifu/gsharePredictor.sv
+++ b/wally-pipelined/src/ifu/gsharePredictor.sv
@@ -53,6 +53,8 @@ module gsharePredictor
   logic 		   BPClassWrongNonCFI;
   logic 		   BPClassWrongCFI;
   logic 		   BPClassRightNonCFI;
+  logic 		   BPClassRightBPWrong;
+  logic 		   BPClassRightBPRight;
 
   logic [6:0] 		   GHRMuxSel;
   logic 		   GHRUpdateEN;