Release fixes

Incorporate prediction fixes