Adding prediction fixes