diff --git a/SoundSwitch.Audio.Manager/AudioSwitcher.cs b/SoundSwitch.Audio.Manager/AudioSwitcher.cs
index f4e3db30a0..6d33f55981 100644
--- a/SoundSwitch.Audio.Manager/AudioSwitcher.cs
+++ b/SoundSwitch.Audio.Manager/AudioSwitcher.cs
@@ -13,11 +13,11 @@ namespace SoundSwitch.Audio.Manager
 {
     public class AudioSwitcher
     {
-        private static AudioSwitcher _instance;
-        private PolicyClient _policyClient;
-        private EnumeratorClient _enumerator;
+        private static AudioSwitcher? _instance;
+        private PolicyClient? _policyClient;
+        private EnumeratorClient? _enumerator;
 
-        private ExtendedPolicyClient _extendedPolicyClient;
+        private ExtendedPolicyClient? _extendedPolicyClient;
 
         private EnumeratorClient EnumeratorClient
         {
@@ -118,6 +118,7 @@ public void SwitchProcessTo(string deviceId, ERole role, EDataFlow flow, uint pr
             {
                 Trace.TraceError($"Can't get process info: {e}");
             }
+
             Trace.TraceInformation($"Attempt to switch [{processId}:{processName}] to {deviceId}");
             var roles = new[]
             {
diff --git a/SoundSwitch.Audio.Manager/Properties/AssemblyInfo.cs b/SoundSwitch.Audio.Manager/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8a24188b80..0000000000
--- a/SoundSwitch.Audio.Manager/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SoundSwitch.Audio.Manager")]
-[assembly: AssemblyDescription("Lib used the manage the default audio device")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("SoundSwitch")]
-[assembly: AssemblyProduct("SoundSwitch.Audio.Manager")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b4f7987e-a5fa-45b1-9ae4-5e40144ffc54")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.*")]
diff --git a/SoundSwitch.Audio.Manager/SoundSwitch.Audio.Manager.csproj b/SoundSwitch.Audio.Manager/SoundSwitch.Audio.Manager.csproj
index b9ee670a02..1b8affd6a6 100644
--- a/SoundSwitch.Audio.Manager/SoundSwitch.Audio.Manager.csproj
+++ b/SoundSwitch.Audio.Manager/SoundSwitch.Audio.Manager.csproj
@@ -3,10 +3,11 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
     <LangVersion>latest</LangVersion>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Deterministic>false</Deterministic>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Configurations>Debug;Release;Nightly</Configurations>
     <Platforms>AnyCPU</Platforms>
+    <AssemblyTitle>SoundSwitch.Audio.Manager</AssemblyTitle>
+    <Version>3.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/SoundSwitch.Common/Properties/AssemblyInfo.cs b/SoundSwitch.Common/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4aabf38135..0000000000
--- a/SoundSwitch.Common/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SoundSwitch.Common")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SoundSwitch.Common")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("45a39bfc-7b67-46f2-a6f2-59bf82b350a4")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.*")]
diff --git a/SoundSwitch.Common/SoundSwitch.Common.csproj b/SoundSwitch.Common/SoundSwitch.Common.csproj
index bad7e8d29c..5c68af6061 100644
--- a/SoundSwitch.Common/SoundSwitch.Common.csproj
+++ b/SoundSwitch.Common/SoundSwitch.Common.csproj
@@ -3,13 +3,15 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <Deterministic>false</Deterministic>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <Deterministic>false</Deterministic>
     <LangVersion>latest</LangVersion>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <Configurations>Debug;Release;Nightly</Configurations>
     <Platforms>AnyCPU</Platforms>
+    <AssemblyTitle>SoundSwitch.Common</AssemblyTitle>
+    <Version>2.2.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="Resources\defaultMicrophone.ico" />
diff --git a/SoundSwitch/Properties/AssemblyInfo.cs b/SoundSwitch/Properties/AssemblyInfo.cs
index 5bb2648e7a..7cd0d40de0 100644
--- a/SoundSwitch/Properties/AssemblyInfo.cs
+++ b/SoundSwitch/Properties/AssemblyInfo.cs
@@ -11,6 +11,7 @@
 [assembly: AssemblyCopyright("Antoine Aflalo")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from