diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index 29b4be072..6d1927562 100644
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -17,4 +17,12 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;CS0649</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;CS0649</NoWarn>
+  </PropertyGroup>
 </Project>
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs
index a56478e43..dfb35c310 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs
@@ -93,7 +93,7 @@ namespace HandBrake.Interop.Interop
                 try
                 {
                     return false; // This feature has been deprecated by Intel.
-                    return IsQsvAvailable && QsvHyperEncode > 0;
+                    // return IsQsvAvailable && QsvHyperEncode > 0;
                 }
                 catch (Exception)
                 {
diff --git a/win/CS/HandBrakeWPF/Commands/RelayCommand.cs b/win/CS/HandBrakeWPF/Commands/RelayCommand.cs
index e3e96d627..97d8bef34 100644
--- a/win/CS/HandBrakeWPF/Commands/RelayCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/RelayCommand.cs
@@ -81,7 +81,7 @@ namespace HandBrakeWPF.Commands
                             throw e.InnerException;
                         }
 
-                        throw e;
+                        throw;
                     }
                 }
             }
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 24d85ac11..223e6fe99 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -30,10 +30,14 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>bin\Debug</OutputPath>
+    <WarningsAsErrors>$(WarningsAsErrors);NU1605</WarningsAsErrors>
+    <NoWarn>1701;1702;CS0067</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>bin\Release</OutputPath>
+    <WarningsAsErrors>$(WarningsAsErrors);NU1605</WarningsAsErrors>
+    <NoWarn>1701;1702;CS0067</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -59,7 +63,6 @@
     <PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.0" />
     <PackageReference Include="System.Management" Version="10.0.0" />
   </ItemGroup>
 
diff --git a/win/CS/HandBrakeWPF/Instance/RemoteBase.cs b/win/CS/HandBrakeWPF/Instance/RemoteBase.cs
index 493f8afeb..205a6e9b9 100644
--- a/win/CS/HandBrakeWPF/Instance/RemoteBase.cs
+++ b/win/CS/HandBrakeWPF/Instance/RemoteBase.cs
@@ -61,7 +61,6 @@ namespace HandBrakeWPF.Instance
             get
             {
                 throw new NotImplementedException("This method is not implemented yet");
-                return 0;
             }
         }
 
diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs
index 5d8915abc..f3d41f04c 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs
@@ -228,8 +228,6 @@ namespace HandBrakeWPF.Services.Queue.Model
                 {
                     return Resources.QueueView_NotAvailable;
                 }
-
-                return string.Empty;
             }
         }
 
diff --git a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
index 2d40a2a70..43f764462 100644
--- a/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
+++ b/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.Utilities
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Globalization;
     using System.Management;
     using System.Runtime.InteropServices;
@@ -176,6 +177,7 @@ namespace HandBrakeWPF.Utilities
                     catch (Exception exc)
                     {
                         // Nothing to do. Just don't display the warnings.
+                        Debug.WriteLine(exc);
                     }
                 });
         }
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index f49e714c7..4f2eb0f95 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1754,6 +1754,7 @@ namespace HandBrakeWPF.ViewModels
                     catch (Exception exc)
                     {
                         // Nothing to do. Just don't display the warnings.
+                        Debug.WriteLine(exc);
                     }
                 });
         }
diff --git a/win/CS/HandBrakeWPF/app.manifest b/win/CS/HandBrakeWPF/app.manifest
index f7474b53e..413bda17f 100644
--- a/win/CS/HandBrakeWPF/app.manifest
+++ b/win/CS/HandBrakeWPF/app.manifest
@@ -50,11 +50,7 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <!-- The combination of below two tags have the following effect : 
-      1) Per-Monitor for >= Windows 10 Anniversary Update
-      2) System < Windows 10 Anniversary Update -->
       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>
 
diff --git a/win/CS/HandBrakeWPF/packages.lock.json b/win/CS/HandBrakeWPF/packages.lock.json
index 89275febb..8c93b15be 100644
--- a/win/CS/HandBrakeWPF/packages.lock.json
+++ b/win/CS/HandBrakeWPF/packages.lock.json
@@ -26,12 +26,6 @@
         "resolved": "1.1.135",
         "contentHash": "r8qBEXmQfORso2+MVHnt8PSH4761zJ0SIxgQTSEDVLU97EN2FZdG6/ZCYUPhQy+OrPKgnpYBCAs3PS6Bs7wRsg=="
       },
-      "System.Drawing.Common": {
-        "type": "Direct",
-        "requested": "[10.0.0, )",
-        "resolved": "10.0.0",
-        "contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA=="
-      },
       "System.Management": {
         "type": "Direct",
         "requested": "[10.0.0, )",