Updates for build b339.