And still more PredictionMode fixes.