Updates for build b498.