Prediction fixes, including travis fix