Small prediction improvements