diff --git a/Project Reboot 3.0/FortGameModeAthena.cpp b/Project Reboot 3.0/FortGameModeAthena.cpp
index 343fa8e..1eda51f 100644
--- a/Project Reboot 3.0/FortGameModeAthena.cpp	
+++ b/Project Reboot 3.0/FortGameModeAthena.cpp	
@@ -626,13 +626,16 @@ bool AFortGameModeAthena::Athena_ReadyToStartMatchHook(AFortGameModeAthena* Game
 	Actors.Free();
 
 	if (ActorsNum == 0)
+	{
+		// LOG_INFO(LogDev, "No Actors!");
 		return false;
+	}
 	
 	// I don't think this map info check is proper.. We can loop through the Actors in the World's PersistentLevel and check if there is a MapInfo, if there is then we can wait, else don't.
 
 	auto MapInfo = GameState->GetMapInfo();
 
-	if (!MapInfo && Engine_Version >= 421)
+	if (Engine_Version >= 421 && !MapInfo)
 		return false;
 
 	static int LastNum = 1;
diff --git a/Project Reboot 3.0/addresses.cpp b/Project Reboot 3.0/addresses.cpp
index 0abdded..eb97228 100644
--- a/Project Reboot 3.0/addresses.cpp	
+++ b/Project Reboot 3.0/addresses.cpp	
@@ -324,6 +324,9 @@ void Addresses::FindAll()
 	LOG_INFO(LogDev, "Finished finding!");
 }
 
+#define PRINT_CRITICAL_OFFSET(offset) if (!offset) LOG_ERROR(LogDev, "Failed to find {}", #offset) \
+	else LOG_INFO(LogDev, "{}: 0x{:x}", #offset, offset - __int64(GetModuleHandleW(0)));
+
 void Addresses::Print()
 {
 	auto Base = __int64(GetModuleHandleW(0));
@@ -382,7 +385,7 @@ void Addresses::Print()
 	LOG_INFO(LogDev, "ApplyCharacterCustomization: 0x{:x}", ApplyCharacterCustomization - Base);
 	LOG_INFO(LogDev, "EnterAircraft: 0x{:x}", EnterAircraft - Base);
 	LOG_INFO(LogDev, "SetTimer: 0x{:x}", SetTimer - Base);
-	LOG_INFO(LogDev, "PickupInitialize: 0x{:x}", PickupInitialize - Base);
+	PRINT_CRITICAL_OFFSET(PickupInitialize);
 	LOG_INFO(LogDev, "FreeEntry: 0x{:x}", FreeEntry - Base);
 	LOG_INFO(LogDev, "FreeArrayOfEntries: 0x{:x}", FreeArrayOfEntries - Base);
 	LOG_INFO(LogDev, "UpdateTrackedAttributesLea: 0x{:x}", UpdateTrackedAttributesLea - Base);
diff --git a/Project Reboot 3.0/dllmain.cpp b/Project Reboot 3.0/dllmain.cpp
index 9e54f01..e385230 100644
--- a/Project Reboot 3.0/dllmain.cpp	
+++ b/Project Reboot 3.0/dllmain.cpp	
@@ -1082,7 +1082,7 @@ DWORD WINAPI Main(LPVOID)
     {
         int increaseOffset = 0x10;
 
-        if (Engine_Version >= 424 && std::floor(Fortnite_Version) < 18) // checked on 11.31, 12.41, 14.60, 15.10, 16.40, 17.30 and 18.40
+        if (Fortnite_Version > 11.00 && std::floor(Fortnite_Version) < 18) // checked on 11.00, 11.31, 12.41, 14.60, 15.10, 16.40, 17.30 and 18.40
             increaseOffset += 0x8;
 
         auto MoveSoundStimulusBroadcastIntervalOffset = FindOffsetStruct("/Script/FortniteGame.FortPlayerPawn", "MoveSoundStimulusBroadcastInterval");