diff --git a/.editorconfig b/.editorconfig
index cc69c49..b49721f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -65,7 +65,7 @@ csharp_space_between_square_brackets = false
 csharp_style_conditional_delegate_call = true : suggestion
 csharp_style_deconstructed_variable_declaration = true : suggestion
 csharp_style_expression_bodied_accessors = true : suggestion
-csharp_style_expression_bodied_constructors = true : suggestion
+csharp_style_expression_bodied_constructors = false : suggestion
 csharp_style_expression_bodied_indexers = true : suggestion
 csharp_style_expression_bodied_lambdas = true : suggestion
 csharp_style_expression_bodied_local_functions = true : suggestion
@@ -95,6 +95,7 @@ csharp_style_var_when_type_is_apparent = true : suggestion
 csharp_using_directive_placement = outside_namespace : warning
 dotnet_analyzer_diagnostic.severity = warning
 dotnet_code_quality_unused_parameters = all : suggestion
+dotnet_diagnostic.CA1014.severity = none
 dotnet_diagnostic.CA1030.severity = none
 dotnet_diagnostic.CA1031.severity = suggestion
 dotnet_diagnostic.CA1032.severity = suggestion
@@ -105,6 +106,8 @@ dotnet_diagnostic.CA1062.severity = suggestion
 dotnet_diagnostic.CA1063.severity = none
 dotnet_diagnostic.CA1303.severity = none
 dotnet_diagnostic.CA1308.severity = suggestion
+dotnet_diagnostic.CA1309.severity = suggestion
+dotnet_diagnostic.CA1508.severity = suggestion
 dotnet_diagnostic.CA1707.severity = none
 dotnet_diagnostic.CA1716.severity = none
 dotnet_diagnostic.CA1720.severity = suggestion
@@ -114,10 +117,13 @@ dotnet_diagnostic.CA1816.severity = none
 dotnet_diagnostic.CA1819.severity = suggestion
 dotnet_diagnostic.CA1822.severity = suggestion
 dotnet_diagnostic.CA1826.severity = suggestion
+dotnet_diagnostic.CA1848.severity = suggestion
 dotnet_diagnostic.CA2000.severity = none
 dotnet_diagnostic.CA2227.severity = none
 dotnet_diagnostic.CA2234.severity = none
 dotnet_diagnostic.CA2237.severity = none
+dotnet_diagnostic.CA2254.severity = none
+dotnet_diagnostic.CA5351.severity = none
 dotnet_diagnostic.IDE0001.severity = warning
 dotnet_diagnostic.IDE0002.severity = warning
 dotnet_diagnostic.IDE0003.severity = warning
@@ -241,6 +247,8 @@ dotnet_diagnostic.SA1633.severity = none
 dotnet_diagnostic.SA1642.severity = none
 dotnet_diagnostic.SA1643.severity = none
 dotnet_diagnostic.SX1101.severity = warning
+dotnet_diagnostic.SYSLIB1045.severity = suggestion
+dotnet_diagnostic.SYSLIB1054.severity = none
 dotnet_naming_rule.local_functions_rule.severity = warning
 dotnet_naming_rule.local_functions_rule.style = upper_camel_case_style
 dotnet_naming_rule.local_functions_rule.symbols = local_functions_symbols
diff --git a/Directory.Build.props b/Directory.Build.props
index 1d917b4..d11c7b1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>$(NoWarn);1591;1998;NU5105;CA1014;CA1508;CA1852</NoWarn>
+    <NoWarn>$(NoWarn);1591;1998;NU5105</NoWarn>
     <DebugType>embedded</DebugType>
     <GitHubOrganization>Faithlife</GitHubOrganization>
     <RepositoryName>RepoName</RepositoryName>
diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj
index d71fc1e..d406f0c 100644
--- a/tools/Build/Build.csproj
+++ b/tools/Build/Build.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
+    <NoWarn>$(NoWarn);CA1852</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools/XmlDocGen/XmlDocGen.csproj b/tools/XmlDocGen/XmlDocGen.csproj
index 121930a..de1d3a5 100644
--- a/tools/XmlDocGen/XmlDocGen.csproj
+++ b/tools/XmlDocGen/XmlDocGen.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
+    <NoWarn>$(NoWarn);CA1852</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>