Updates for build b497.