diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
index 2e5c1857a10..dfd4499053a 100644
--- a/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
+++ b/Core/GameEngine/Source/GameNetwork/GameSpy/MainMenuUtils.cpp
@@ -857,9 +857,9 @@ void StartPatchCheck( void )
 
 	NGMP_OnlineServicesManager::GetInstance()->StartVersionCheck([](bool bSuccess, bool bNeedsUpdate)
 		{
-#if defined(USE_TEST_ENV) || defined(USE_DEBUG_ON_LIVE_SERVER)
+// #if defined(USE_TEST_ENV) || defined(USE_DEBUG_ON_LIVE_SERVER)
 			bNeedsUpdate = false;
-#endif
+// #endif
 
 
 			cantConnectBeforeOnline = !bSuccess;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h
index 7d8752f7b9e..7eb444431b2 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h
@@ -146,18 +146,19 @@ class NetworkMesh
 
 	Real getMaximumHistoricalLatency()
 	{
-		int highestLatency = 0;
+		int highestLatencyMs = 0;
 
 		for (auto& kvPair : m_mapConnections)
 		{
 			PlayerConnection& conn = kvPair.second;
-			if (conn.GetLatency() > highestLatency)
+			int histMs = conn.GetHighestHistoricalLatency(); // ms
+			if (histMs > highestLatencyMs)
 			{
-				highestLatency = conn.GetHighestHistoricalLatency();
+				highestLatencyMs = histMs;
 			}
 		}
 
-		return Real(highestLatency);
+		return Real(highestLatencyMs) / 1000.0f;
 	}
 
 
@@ -203,3 +204,5 @@ class NetworkMesh
 	std::string m_strTurnUsernameString;
 	std::string m_strTurnTokenString;
 };
+
+
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp
index 17523d5370c..a3798107611 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp
@@ -449,8 +449,8 @@ void NGMPGame::launchGame(void)
 	NetworkMesh* pMesh = NGMP_OnlineServicesManager::GetNetworkMesh();
 	if (pMesh != nullptr)
 	{
-
-		TheNetwork->SeedLatencyData(pMesh->getMaximumHistoricalLatency());
+		// pMesh->getMaximumHistoricalLatency() returns ms as Real, cast to int
+		TheNetwork->SeedLatencyData(static_cast<int>(pMesh->getMaximumHistoricalLatency()));
 	}
 
 	// TODO_NGMP: Do we really care about these values anymore
@@ -546,3 +546,4 @@ void NGMPGame::StartCountdown()
 		pWS->SendData_CountdownStarted();
 	}
 }
+