Updates for build b404.