diff --git a/Directory.Build.props b/Directory.Build.props
index 6b3ff307..c7542325 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,19 +18,13 @@ SPDX-License-Identifier: GPL-3.0-only
     <!-- For PowerShell, we support everything -->
     <Platforms>AnyCPU</Platforms>
     <Platform>AnyCPU</Platform>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
-    <IsTrimmable>false</IsTrimmable>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework) != 'netstandard2.0'">
     <!-- This product only supports x64 (the only architecture supported by VBoxUsb) -->
     <Platforms>x64</Platforms>
     <Platform>x64</Platform>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
-    <IsTrimmable>true</IsTrimmable>
-    <!--
     <IsAotCompatible>true</IsAotCompatible>
-    -->
   </PropertyGroup>
 
   <PropertyGroup>
@@ -59,6 +53,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
     <Product>usbipd-win</Product>
     <Company>Frans van Dorsselaer</Company>
diff --git a/Installer/packages.lock.json b/Installer/packages.lock.json
index 0cbe1443..85e67dca 100644
--- a/Installer/packages.lock.json
+++ b/Installer/packages.lock.json
@@ -26,7 +26,6 @@
         "resolved": "5.0.0",
         "contentHash": "7lLwyrf+2cTuPju0swTWtRNYesnOMxXhGugMnGGNEPDB4g/+BCUsub2RDYAxnBnbnND7QmPwZnneLrTIQOdAbg=="
       }
-    },
-    "native,Version=v0.0/win-x64": {}
+    }
   }
 }
\ No newline at end of file
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 852671d4..50fc130b 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-only
   <PropertyGroup>
     <TargetFrameworks>$(MainTargetFramework)</TargetFrameworks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsAotCompatible>false</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json
index 64d83abc..23d92820 100644
--- a/UnitTests/packages.lock.json
+++ b/UnitTests/packages.lock.json
@@ -14,12 +14,6 @@
         "resolved": "5.12.0",
         "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
       },
-      "Microsoft.NET.ILLink.Tasks": {
-        "type": "Direct",
-        "requested": "[8.0.4, )",
-        "resolved": "8.0.4",
-        "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw=="
-      },
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
         "requested": "[17.9.0, )",
@@ -532,26 +526,6 @@
         "resolved": "2.0.0-beta4.22272.1",
         "contentHash": "1uqED/q2H0kKoLJ4+hI2iPSBSEdTuhfCYADeJrAqERmiGQ2NNacYKRNEQ+gFbU4glgVyK8rxI+ZOe1onEtr/Pg=="
       }
-    },
-    "net8.0-windows10.0.17763/win-x64": {
-      "System.Diagnostics.EventLog": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A=="
-      },
-      "System.ServiceProcess.ServiceController": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "jtYVG3bpw2n/NvNnP2g/JLri0D4UtfusTvLeH6cZPNAEjJXJVGspS3wLgVvjNbm+wjaYkFgsXejMTocV1T5DIQ==",
-        "dependencies": {
-          "System.Diagnostics.EventLog": "8.0.0"
-        }
-      },
-      "System.Text.Encodings.Web": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/UsbIds/UsbIds.csproj b/UsbIds/UsbIds.csproj
index d16287eb..c2aaf8ad 100644
--- a/UsbIds/UsbIds.csproj
+++ b/UsbIds/UsbIds.csproj
@@ -8,7 +8,6 @@ SPDX-License-Identifier: GPL-3.0-only
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
     <IsRoslynComponent>true</IsRoslynComponent>
   </PropertyGroup>
diff --git a/UsbIds/packages.lock.json b/UsbIds/packages.lock.json
index ae079386..08bcb05c 100644
--- a/UsbIds/packages.lock.json
+++ b/UsbIds/packages.lock.json
@@ -110,7 +110,6 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       }
-    },
-    ".NETStandard,Version=v2.0/win-x64": {}
+    }
   }
 }
\ No newline at end of file
diff --git a/Usbipd.Automation/packages.lock.json b/Usbipd.Automation/packages.lock.json
index a1b9131d..2696c994 100644
--- a/Usbipd.Automation/packages.lock.json
+++ b/Usbipd.Automation/packages.lock.json
@@ -23,8 +23,6 @@
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
       }
     },
-    ".NETStandard,Version=v2.0/win-x64": {},
-    ".NETStandard,Version=v2.0/win-x86": {},
     "net8.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
@@ -38,8 +36,6 @@
         "resolved": "8.0.4",
         "contentHash": "PZb5nfQ+U19nhnmnR9T1jw+LTmozhuG2eeuzuW5A7DqxD/UXW2ucjmNJqnqOuh8rdPzM3MQXoF8AfFCedJdCUw=="
       }
-    },
-    "net8.0-windows10.0.17763/win-x64": {},
-    "net8.0-windows10.0.17763/win-x86": {}
+    }
   }
 }
\ No newline at end of file
diff --git a/Usbipd.PowerShell/packages.lock.json b/Usbipd.PowerShell/packages.lock.json
index d2125a32..d996fa1b 100644
--- a/Usbipd.PowerShell/packages.lock.json
+++ b/Usbipd.PowerShell/packages.lock.json
@@ -31,8 +31,6 @@
       "usbipd.automation": {
         "type": "Project"
       }
-    },
-    ".NETStandard,Version=v2.0/win-x64": {},
-    ".NETStandard,Version=v2.0/win-x86": {}
+    }
   }
 }
\ No newline at end of file
diff --git a/usbipd-win.sln b/usbipd-win.sln
index 009ff613..1e9129aa 100644
--- a/usbipd-win.sln
+++ b/usbipd-win.sln
@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Packages.props = Directory.Packages.props
 		GitVersion.yml = GitVersion.yml
 		global.json = global.json
-		NetStandard.props = NetStandard.props
 		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection