Updates for build b396.