Updates for build b418.