Updates for build b304.