Updates for build b536.