diff --git a/build.ps1 b/build.ps1
index 0fd55e674..7f79e29f3 100755
--- a/build.ps1
+++ b/build.ps1
@@ -200,6 +200,11 @@ process {
             Install-Clippy -UseCFS:$UseCFS -Architecture $Architecture @VerboseParam
         }
 
+        if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows) {
+            Write-BuildProgress @progressParams -Status "Ensuring Windows C++ build tools are available"
+            Install-WindowsCPlusPlusBuildTools @VerboseParam
+        }
+
         if (-not ($SkipBuild -and $Test -and $ExcludeRustTests)) {
             Write-BuildProgress @progressParams -Status 'Ensuring Protobuf is available'
             Install-Protobuf @VerboseParam
@@ -212,10 +217,6 @@ process {
         }
     }
 
-    if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows) {
-        Write-BuildProgress @progressParams -Status "Ensuring Windows C++ build tools are available"
-        Install-WindowsCPlusPlusBuildTools @VerboseParam
-    }
     #endregion Setup
 
     if (!$SkipBuild) {
diff --git a/resources/dism_dsc/src/dism.rs b/resources/dism_dsc/src/dism.rs
index 70415fe20..167b20597 100644
--- a/resources/dism_dsc/src/dism.rs
+++ b/resources/dism_dsc/src/dism.rs
@@ -25,13 +25,13 @@ unsafe extern "system" {
     ) -> *mut c_void;
 }
 
-#[repr(C, packed(4))]
+#[repr(C, packed)]
 struct DismFeature {
     feature_name: *const u16,
     state: i32,
 }
 
-#[repr(C, packed(4))]
+#[repr(C, packed)]
 struct DismFeatureInfo {
     feature_name: *const u16,
     state: i32,
@@ -42,13 +42,13 @@ struct DismFeatureInfo {
     custom_property_count: u32,
 }
 
-#[repr(C, packed(4))]
+#[repr(C, packed)]
 struct DismCapability {
     name: *const u16,
     state: i32,
 }
 
-#[repr(C, packed(4))]
+#[repr(C, packed)]
 struct DismCapabilityDetail {
     name: *const u16,
     state: i32,