Updates for build b387.