Update defaulting to match new build changes.