Updates for build b394.