Prediction fixes