diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index e8921f942e..d93cd9851b 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -175,8 +175,8 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <!-- Define windows, release configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(IsWindows)' == 'true' ">
+  <!-- Define all OS, release configuration properties -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'StaticAnalysis' ">
     <Optimize>true</Optimize>
     <!-- This is required to be full for compliance tools !-->
     <DebugType>full</DebugType>
@@ -188,13 +188,6 @@
          Debugging the issues resolves the problem
      -->
     <Optimize>false</Optimize>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-
-  <!-- Define all OS, CodeCoverage configuration properties -->
-  <PropertyGroup Condition=" '$(Configuration)' == 'CodeCoverage' ">
-    <!-- This is required to be portable to Coverlet tool !-->
-    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 65f1c009ad..d9719c6b8b 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3105,9 +3105,6 @@
       <Component Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E">
         <File Id="fil6EF5C2AED8674A32B0F3CCEE9CBEED71" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Asn1.dll" />
       </Component>
-      <Component Id="cmp1EBDE676D79B4B0DB859B3F601D78513">
-        <File Id="fil589A10D0D26C4D7F8479F40D11824D63" KeyPath="yes" Source="$(var.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
-      </Component>
       <Component Id="cmpB92B70CEFC2F438386F97264FB436CDD">
         <File Id="fil824D1A506096432888ABC2FDFAFABEE5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Diagnostics.EventLog.Messages.dll" />
       </Component>
@@ -3154,6 +3151,9 @@
       <Component Id="cmp96588875574749E295496861FFC1DB58">
         <File Id="filF931B05A25224A188D08E09A9FDC3A58" KeyPath="yes" Source="$(var.ProductSourcePath)\PenImc_cor3.dll" />
       </Component>
+      <Component Id="cmp6986F8B66C514347A25E03DD3096B5AE">
+        <File Id="fil9276D1BDBF8B4C91B90761633720A419" KeyPath="yes" Source="$(var.ProductSourcePath)\PresentationNative_cor3.dll" />
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
@@ -4155,7 +4155,6 @@
       <ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
       <ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
       <ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
-      <ComponentRef Id="cmp1EBDE676D79B4B0DB859B3F601D78513" />
       <ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
       <ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
       <ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
@@ -4167,9 +4166,34 @@
       <ComponentRef Id="cmp3CF3F69A352F4438B8F2F73EBBD12996" />
       <ComponentRef Id="cmp09155DA101E1424B98832A789E93E835" />
       <ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
-      <ComponentRef Id="cmp67BD9092B046498294EB7689F85B33E8" />
+      <ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
+      <ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
+      <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
+      <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
+      <ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
+      <ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
+      <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
+      <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
+      <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
+      <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
+      <ComponentRef Id="cmpE5993DB9118640FD8C180A2D61C89C01" />
+      <ComponentRef Id="cmpE0DEAA289B2D4594A0C4791B2808C97C" />
+      <ComponentRef Id="cmpFE56825F03274064A69AA43CA4B597C7" />
+      <ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
+      <ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
+      <ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
+      <ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
+      <ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
+      <ComponentRef Id="cmp41C949169E9341CC9297641456FEE2CC" />
+      <ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
+      <ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
+      <ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
+      <ComponentRef Id="cmp42A739F2AAC24D729DDBCAA096B8C55A" />
+      <ComponentRef Id="cmp2BB1C07A912442B0BB6270D7EB3185F3" />
+      <ComponentRef Id="cmp76EB2749D0464D41AD1D2BA2C51CF4C9" />
+      <ComponentRef Id="cmpF5FD2E392BD94BCD957480F128A38E10" />
+      <ComponentRef Id="cmp28DEAACC47FD4B04A95521A375761643" />
       <ComponentRef Id="cmp6986F8B66C514347A25E03DD3096B5AE" />
-      <ComponentRef Id="cmp96588875574749E295496861FFC1DB58" />
     </ComponentGroup>
   </Fragment>
 </Wix>