Added bug fixes for week 50 release.