diff --git a/CS2GSI.sln.DotSettings b/CS2GSI.sln.DotSettings
index 8925a21..7020e16 100644
--- a/CS2GSI.sln.DotSettings
+++ b/CS2GSI.sln.DotSettings
@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=steamid/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/CS2GSI/CS2GSI.cs b/CS2GSI/CS2GSI.cs
index cbb512c..8834043 100644
--- a/CS2GSI/CS2GSI.cs
+++ b/CS2GSI/CS2GSI.cs
@@ -6,7 +6,7 @@ namespace CS2GSI;
 
 public class CS2GSI
 {
-    private readonly GSIServer _gsiServer;
+    private readonly GSIServer _gsiServer = null!;
     private readonly List<CS2GameState> _allGameStates = new();
     private CS2GameState? _lastLocalGameState = null;
     private readonly ILogger? _logger;
diff --git a/CS2GSI/GameState/CS2GameState.cs b/CS2GSI/GameState/CS2GameState.cs
index b321811..2e0333e 100644
--- a/CS2GSI/GameState/CS2GameState.cs
+++ b/CS2GSI/GameState/CS2GameState.cs
@@ -4,7 +4,7 @@ namespace CS2GSI.GameState;
 
 public record CS2GameState : GameState
 {
-    public string ProviderSteamId;
+    public string ProviderSteamId = null!;
     public int Timestamp;
     public Map? Map;
     public Player? Player;
diff --git a/CS2GSI/GameState/Map.cs b/CS2GSI/GameState/Map.cs
index c84b768..929c1c6 100644
--- a/CS2GSI/GameState/Map.cs
+++ b/CS2GSI/GameState/Map.cs
@@ -4,10 +4,10 @@ namespace CS2GSI.GameState;
 
 public record Map : GameState
 {
-    public string Mode, MapName;
+    public string Mode = null!, MapName = null!;
     public MapPhase Phase;
     public int Round, NumMatchesToWinSeries;
-    public GameStateTeam GameStateTeamCT, GameStateTeamT;
+    public GameStateTeam GameStateTeamCT = null!, GameStateTeamT = null!;
     
     public override string ToString()
     {
diff --git a/CS2GSI/GameState/Player.cs b/CS2GSI/GameState/Player.cs
index f606a1d..dd7e3fd 100644
--- a/CS2GSI/GameState/Player.cs
+++ b/CS2GSI/GameState/Player.cs
@@ -4,7 +4,7 @@ namespace CS2GSI.GameState;
 
 public record Player : GameState
 {
-    public string SteamId, Name;
+    public string SteamId = null!, Name = null!;
     public PlayerActivity Activity;
     public CS2Team? Team;
     public int? ObserverSlot;