diff --git a/ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs b/ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs
index 8c467b1711..ebf24cfafd 100644
--- a/ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs
+++ b/ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs
@@ -217,16 +217,20 @@ namespace BizHawk.Experiment.AutoGenConfig
 
 			protected virtual string SerializeTValue(TValue v) => v?.ToString() ?? NULL_SERIALIZATION;
 
+#pragma warning disable CS8600
 #pragma warning disable CS8604
 			string IConfigPropEditorUIGen.SerializeTValue(object? v) => SerializeTValue((TValue) v);
 #pragma warning restore CS8604
+#pragma warning restore CS8600
 
 			/// <inheritdoc cref="IConfigPropEditorUIGen.TValueEquality"/>
 			protected abstract bool TValueEquality(TValue a, TValue b);
 
+#pragma warning disable CS8600
 #pragma warning disable CS8604
 			bool IConfigPropEditorUIGen.TValueEquality(object? a, object? b) => TValueEquality((TValue) a, (TValue) b);
 #pragma warning restore CS8604
+#pragma warning restore CS8600
 
 			protected const string NULL_SERIALIZATION = "(null)";
 
diff --git a/ExternalToolProjects/DBMan/DBMan.csproj b/ExternalToolProjects/DBMan/DBMan.csproj
index e379858539..32c3741ee7 100644
--- a/ExternalToolProjects/DBMan/DBMan.csproj
+++ b/ExternalToolProjects/DBMan/DBMan.csproj
@@ -5,7 +5,7 @@
 		<GenerateResourceMSBuildArchitecture Condition=" '$(GenerateResourceMSBuildArchitecture)' == '' ">CurrentArchitecture</GenerateResourceMSBuildArchitecture>
 		<GenerateResourceMSBuildRuntime Condition=" '$(GenerateResourceMSBuildRuntime)' == '' ">CurrentRuntime</GenerateResourceMSBuildRuntime>
 		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
-		<NoWarn>$(NoWarn);SA1400</NoWarn>
+		<NoWarn>$(NoWarn);MSB3270;SA1400</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="System.Memory" Version="4.5.4" />