diff --git a/Directory.Packages.props b/Directory.Packages.props
index e43ea8ab..c8825755 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <NoWarn>$(NoWarn);NU1507</NoWarn>
+    <NoWarn>$(NoWarn);NU1507;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AWSSDK.Core" Version="4.0.3.12" />
diff --git a/ObjectListView/SubControls/ToolTipControl.cs b/ObjectListView/SubControls/ToolTipControl.cs
index 9cd345a9..d9b69b44 100644
--- a/ObjectListView/SubControls/ToolTipControl.cs
+++ b/ObjectListView/SubControls/ToolTipControl.cs
@@ -645,7 +645,6 @@ namespace BrightIdeasSoftware
         /// Mess with the basic message pump of the tooltip
         /// </summary>
         /// <param name="msg"></param>
-        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]       
         override protected void WndProc(ref Message msg) {
             //System.Diagnostics.Trace.WriteLine(String.Format("xx {0:x}", msg.Msg));
             switch (msg.Msg) {
@@ -697,5 +696,4 @@ namespace BrightIdeasSoftware
 
         #endregion
     }
-
 }
\ No newline at end of file
diff --git a/mRemoteNG/Connection/PuttySessionInfo.cs b/mRemoteNG/Connection/PuttySessionInfo.cs
index eb2eb4da..f8eb72dc 100644
--- a/mRemoteNG/Connection/PuttySessionInfo.cs
+++ b/mRemoteNG/Connection/PuttySessionInfo.cs
@@ -103,7 +103,7 @@ namespace mRemoteNG.Connection
             Disposed?.Invoke(this, EventArgs.Empty);
         }
 
-        public event EventHandler Disposed;
+        public event EventHandler? Disposed;
 
         #endregion
     }
diff --git a/mRemoteNG/Tools/Authenticode.cs b/mRemoteNG/Tools/Authenticode.cs
index 161363bb..d51e7dac 100644
--- a/mRemoteNG/Tools/Authenticode.cs
+++ b/mRemoteNG/Tools/Authenticode.cs
@@ -46,17 +46,19 @@ namespace mRemoteNG.Tools
 						return Status;
 					}
 
-                    //X509Certificate2 certificate2 = new(X509Certificate.CreateFromSignedFile(FilePath));
+#pragma warning disable SYSLIB0057
+					using X509Certificate cert = X509Certificate.CreateFromSignedFile(FilePath);
+					byte[] certData = cert.GetRawCertData();
+#pragma warning restore SYSLIB0057
+					X509Certificate2 certificate2 = X509CertificateLoader.LoadCertificate(certData);
+					_thumbprint = certificate2.Thumbprint;
 
-                    X509Certificate2 certificate2 = new(X509Certificate.CreateFromSignedFile(FilePath));
-                    _thumbprint = certificate2.Thumbprint;
-
-                    if (_thumbprint != ThumbprintToMatch)
-                    {
-                        Status = StatusValue.ThumbprintNotMatch;
-                        return Status;
-                    }
-                }
+					if (_thumbprint != ThumbprintToMatch)
+					{
+						Status = StatusValue.ThumbprintNotMatch;
+						return Status;
+					}
+				}
 
                 NativeMethods.WINTRUST_FILE_INFO trustFileInfo = new() { pcwszFilePath = FilePath};
 			    trustFileInfoPointer = Marshal.AllocCoTaskMem(Marshal.SizeOf(trustFileInfo));
diff --git a/mRemoteNG/Tools/SSHTunnelTypeConverter.cs b/mRemoteNG/Tools/SSHTunnelTypeConverter.cs
index e94d93b1..c77a3d21 100644
--- a/mRemoteNG/Tools/SSHTunnelTypeConverter.cs
+++ b/mRemoteNG/Tools/SSHTunnelTypeConverter.cs
@@ -42,17 +42,17 @@ namespace mRemoteNG.Tools
             return result;
         }
 
-        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
+        public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext? context)
         {
             return new StandardValuesCollection(SshTunnels);
         }
 
-        public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
+        public override bool GetStandardValuesExclusive(ITypeDescriptorContext? context)
         {
             return true;
         }
 
-        public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
+        public override bool GetStandardValuesSupported(ITypeDescriptorContext? context)
         {
             return true;
         }
diff --git a/mRemoteNG/UI/TaskDialog/CommandButton.cs b/mRemoteNG/UI/TaskDialog/CommandButton.cs
index 6f4d5ef0..7fd67066 100644
--- a/mRemoteNG/UI/TaskDialog/CommandButton.cs
+++ b/mRemoteNG/UI/TaskDialog/CommandButton.cs
@@ -40,7 +40,7 @@ namespace mRemoteNG.UI.TaskDialog
 
         //--------------------------------------------------------------------------------
         // Override this to make sure the control is invalidated (repainted) when 'Text' is changed
-        public override string Text
+        public override string? Text
         {
             get => base.Text;
             set
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index 0f9c1731..6c6818f7 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Platforms>x64;arm64</Platforms>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+    <NoWarn>$(NoWarn);NU1701</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -149,59 +150,16 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
     <PackageReference Include="Microsoft.NETCore.Platforms" />
     <PackageReference Include="Microsoft.NETCore.Targets" />
-    <PackageReference Include="Microsoft.VisualStudio.TextTemplating.VSHost" />
     <PackageReference Include="Microsoft.Web.WebView2" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
     <PackageReference Include="MySql.Data" />
-    <PackageReference Include="NETStandard.Library" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Newtonsoft.Json.Schema" />
     <PackageReference Include="OpenCover" />
     <PackageReference Include="Renci.SshNet.Async" />
     <PackageReference Include="ReportGenerator" />
-    <PackageReference Include="runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.native.System" />
-    <PackageReference Include="runtime.native.System.IO.Compression" />
-    <PackageReference Include="runtime.native.System.Net.Http" />
-    <PackageReference Include="runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" />
     <PackageReference Include="SSH.NET" />
-    <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <PackageReference Include="System.Console" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Diagnostics.EventLog" />
-    <PackageReference Include="System.DirectoryServices" />
-    <PackageReference Include="System.Drawing.Common" />
-    <PackageReference Include="System.Formats.Asn1" />
-    <PackageReference Include="System.IO.Pipelines" />
     <PackageReference Include="System.Management" />
-    <PackageReference Include="System.Net.Primitives" />
-    <PackageReference Include="System.Net.Sockets" />
-    <PackageReference Include="System.Reflection.Emit" />
-    <PackageReference Include="System.Reflection.Emit.ILGeneration" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" />
-    <PackageReference Include="System.Reflection.Metadata" />
-    <PackageReference Include="System.Resources.ResourceManager" />
-    <PackageReference Include="System.Runtime.Extensions" />
-    <PackageReference Include="System.Security.AccessControl" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" />
-    <PackageReference Include="System.Security.Cryptography.Cng" />
-    <PackageReference Include="System.Security.Cryptography.OpenSsl" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" />
-    <PackageReference Include="System.Security.Cryptography.X509Certificates" />
-    <PackageReference Include="System.Security.Permissions" />
-    <PackageReference Include="System.Security.Principal.Windows" />
-    <PackageReference Include="System.Text.Encoding.CodePages" />
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Text.RegularExpressions" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" />
-    <PackageReference Include="System.Windows.Extensions" />
-    <PackageReference Include="System.Xml.ReaderWriter" />
     <PackageReference Include="VncSharpCore" />
     <PackageReference Include="ZstdSharp.Port" />
   </ItemGroup>