Updates for build b258.