diff --git a/build/pipelines/release.yml b/build/pipelines/release.yml
index ddae59087eb..85af67ac0d1 100644
--- a/build/pipelines/release.yml
+++ b/build/pipelines/release.yml
@@ -331,7 +331,7 @@ jobs:
         # Overrides default build sources directory
         sourceTargetOverrideAll: $(Build.SourcesDirectory)
         # Overrides default build binaries directory when "Scan all" option is specified
-        binariesTargetOverrideAll: $(Build.SourcesDirectory)\bin\$(BuildPlatform)\$(BuildConfiguration)
+        binariesTargetOverrideAll: $(Build.SourcesDirectory)\bin
   
         # Set the tools to false if they should not run in the build
         tools:
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
index 7f0c0915d8b..57184c9736a 100644
--- a/src/common.build.pre.props
+++ b/src/common.build.pre.props
@@ -171,7 +171,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>/debugtype:cv,fixup /guard:xfg %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/debugtype:cv,fixup /guard:cf,xfg %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>