diff --git a/.editorconfig b/.editorconfig
index aca5722148..733b99eba6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,21 @@ dotnet_diagnostic.CA1062.severity = suggestion
 
 # CA1303: Do not pass literals as localized parameters
 dotnet_diagnostic.CA1303.severity = suggestion
+
+# CA1305: Specify IFormatProvider
+dotnet_diagnostic.CA1305.severity = suggestion
+
+# CA1031: Do not catch general exception types
+dotnet_diagnostic.CA1031.severity = suggestion
+
+# CA1304: Specify CultureInfo
+dotnet_diagnostic.CA1304.severity = suggestion
+
+# CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1051.severity = silent
+
+# CA1712: Do not prefix enum values with type name
+dotnet_diagnostic.CA1712.severity = silent
+
+# CA1307: Specify StringComparison
+dotnet_diagnostic.CA1307.severity = suggestion
diff --git a/Common.cs b/Common.cs
index 4cae77560a..58c1d276f0 100644
--- a/Common.cs
+++ b/Common.cs
@@ -11,7 +11,7 @@
 
 namespace MissionPlanner
 {
-    public class Common
+    public static class Common
     {
         public static GMapMarker getMAVMarker(MAVState MAV)
         {
diff --git a/GlobalSuppressions.cs b/GlobalSuppressions.cs
new file mode 100644
index 0000000000..372222dffd
--- /dev/null
+++ b/GlobalSuppressions.cs
@@ -0,0 +1,5 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
index c8606d0a94..81dbc34348 100644
--- a/MissionPlanner.csproj
+++ b/MissionPlanner.csproj
@@ -454,6 +454,7 @@
     <Compile Include="GCSViews\ConfigurationView\ConfigUserDefined.Designer.cs">
       <DependentUpon>ConfigUserDefined.cs</DependentUpon>
     </Compile>
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Joystick\JoystickAxis.cs">
       <SubType>UserControl</SubType>
     </Compile>