diff --git a/wally-pipelined/src/ifu/ifu.sv b/wally-pipelined/src/ifu/ifu.sv
index 1df3b5ff5..371205051 100644
--- a/wally-pipelined/src/ifu/ifu.sv
+++ b/wally-pipelined/src/ifu/ifu.sv
@@ -184,7 +184,7 @@ module ifu (
       assign BPPredDirWrongE = 1'b0;
       assign BTBPredPCWrongE = 1'b0;
       assign RASPredPCWrongE = 1'b0;
-      assign BPPredClassNonCFIWrong = 1'b0;
+      assign BPPredClassNonCFIWrongE = 1'b0;
     end      
   endgenerate
   // The true correct target is PCTargetE if PCSrcE is 1 else it is the fall through PCLinkE.
diff --git a/wally-pipelined/src/ifu/localHistoryPredictor.sv b/wally-pipelined/src/ifu/localHistoryPredictor.sv
index 70e85562e..2d5469fd9 100644
--- a/wally-pipelined/src/ifu/localHistoryPredictor.sv
+++ b/wally-pipelined/src/ifu/localHistoryPredictor.sv
@@ -44,7 +44,7 @@ module localHistoryPredictor
    );
 
    logic [2**m-1:0][k-1:0] LHRNextF;
-   logic [k-1:0]       LHRF, ForwardLHRNext;
+   logic [k-1:0]       LHRF, LHRFNext, ForwardLHRNext;
    logic [m-1:0] 	   LookUpPCIndex, UpdatePCIndex;
    logic [1:0] 		   PredictionMemory;
    logic 		   DoForwarding, DoForwardingF, DoForwardingPHT, DoForwardingPHTF;