Updates for build b311.