Index: binary-improvements/7dtd-server-fixes/src/API.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/API.cs	(revision 336)
+++ binary-improvements/7dtd-server-fixes/src/API.cs	(revision 337)
@@ -4,5 +4,5 @@
 	public class API : IModApi {
 		public void InitMod () {
-			ModEvents.GameAwake.RegisterHandler (GameAwake);
+			ModEvents.GameStartDone.RegisterHandler (GameAwake);
 			ModEvents.GameShutdown.RegisterHandler (GameShutdown);
 			ModEvents.SavePlayerData.RegisterHandler (SavePlayerData);
Index: binary-improvements/MapRendering/API.cs
===================================================================
--- binary-improvements/MapRendering/API.cs	(revision 336)
+++ binary-improvements/MapRendering/API.cs	(revision 337)
@@ -5,5 +5,4 @@
 	public class API : IModApi {
 		public void InitMod () {
-			ModEvents.GameAwake.RegisterHandler (GameAwake);
 			ModEvents.GameStartDone.RegisterHandler (GameStartDone);
 			ModEvents.GameShutdown.RegisterHandler (GameShutdown);
@@ -11,11 +10,9 @@
 		}
 
-		private void GameAwake () {
+		private void GameStartDone () {
 			// ReSharper disable once ObjectCreationAsStatement
 			new Web ();
 			LogBuffer.Init ();
-		}
 
-		private void GameStartDone () {
 			if (ItemIconHandler.Instance != null) {
 				ItemIconHandler.Instance.LoadIcons ();