Updates for build b222.