diff --git a/include/Nazara/Network/ENetHost.hpp b/include/Nazara/Network/ENetHost.hpp
index 97b12f2c0..376e03002 100644
--- a/include/Nazara/Network/ENetHost.hpp
+++ b/include/Nazara/Network/ENetHost.hpp
@@ -128,10 +128,10 @@ namespace Nz
 			UInt32 m_incomingBandwidth;
 			UInt32 m_outgoingBandwidth;
 			UInt32 m_serviceTime;
-			UInt32 m_totalSentData;
 			UInt32 m_totalSentPackets;
-			UInt32 m_totalReceivedData;
 			UInt32 m_totalReceivedPackets;
+			UInt64 m_totalSentData;
+			UInt64 m_totalReceivedData;
 			bool m_continueSending;
 			bool m_isSimulationEnabled;
 			bool m_recalculateBandwidthLimits;
diff --git a/src/Nazara/Network/ENetHost.cpp b/src/Nazara/Network/ENetHost.cpp
index 360142c37..0b73a1491 100644
--- a/src/Nazara/Network/ENetHost.cpp
+++ b/src/Nazara/Network/ENetHost.cpp
@@ -440,7 +440,7 @@ namespace Nz
 		if (!peer || duplicatePeers >= m_duplicatePeers)
 			return nullptr;
 
-		channelCount = std::min<UInt32>(channelCount, m_channelLimit);
+		channelCount = std::min(channelCount, UInt32(m_channelLimit));
 
 		peer->InitIncoming(channelCount, m_receivedAddress, command->connect);
 
@@ -514,7 +514,7 @@ namespace Nz
 		if (peer)
 		{
 			peer->m_address = m_receivedAddress;
-			peer->m_incomingDataTotal += m_receivedDataLength;
+			peer->m_incomingDataTotal += UInt32(m_receivedDataLength);
 		}
 
 		auto commandError = [&]() -> bool
diff --git a/src/Nazara/Network/ENetPeer.cpp b/src/Nazara/Network/ENetPeer.cpp
index 33c7fc465..a3946e56e 100644
--- a/src/Nazara/Network/ENetPeer.cpp
+++ b/src/Nazara/Network/ENetPeer.cpp
@@ -4,15 +4,6 @@
 #include <Nazara/Network/NetPacket.hpp>
 #include <Nazara/Network/Debug.hpp>
 
-#define ENET_TIME_OVERFLOW 86400000
-
-#define ENET_TIME_LESS(a, b) ((a) - (b) >= ENET_TIME_OVERFLOW)
-#define ENET_TIME_GREATER(a, b) ((b) - (a) >= ENET_TIME_OVERFLOW)
-#define ENET_TIME_LESS_EQUAL(a, b) (! ENET_TIME_GREATER (a, b))
-#define ENET_TIME_GREATER_EQUAL(a, b) (! ENET_TIME_LESS (a, b))
-
-#define ENET_TIME_DIFFERENCE(a, b) ((a) - (b) >= ENET_TIME_OVERFLOW ? (b) - (a) : (a) - (b))
-
 namespace Nz
 {
 	/// Temporary
@@ -216,9 +207,7 @@ namespace Nz
 
 		Channel& channel = m_channels[channelId];
 
-		std::size_t fragmentLength = m_mtu - sizeof(ENetProtocolHeader) - sizeof(ENetProtocolSendFragment);
-		//if (m_host->m_checksum != nullptr)
-		//	fragmentLength -= sizeof(UInt32);
+		UInt16 fragmentLength = static_cast<UInt16>(m_mtu - sizeof(ENetProtocolHeader) - sizeof(ENetProtocolSendFragment));
 
 		UInt32 packetSize = static_cast<UInt32>(packetRef->data.GetDataSize());
 		if (packetSize > fragmentLength)
@@ -252,11 +241,11 @@ namespace Nz
 				fragmentOffset += fragmentLength)
 			{
 				if (packetSize - fragmentOffset < fragmentLength)
-					fragmentLength = packetSize - fragmentOffset;
+					fragmentLength = UInt16(packetSize - fragmentOffset);
 
 				OutgoingCommand outgoingCommand;
 				outgoingCommand.fragmentOffset = fragmentOffset;
-				outgoingCommand.fragmentLength = static_cast<UInt16>(fragmentLength);
+				outgoingCommand.fragmentLength = fragmentLength;
 				outgoingCommand.packet = packetRef;
 				outgoingCommand.command.header.command = commandNumber;
 				outgoingCommand.command.header.channelID = channelId;
@@ -312,6 +301,8 @@ namespace Nz
 
 	bool ENetPeer::CheckTimeouts(ENetEvent* event)
 	{
+		UInt32 serviceTime = m_host->GetServiceTime();
+
 		auto currentCommand = m_sentReliableCommands.begin();
 		while (currentCommand != m_sentReliableCommands.end())
 		{
@@ -816,7 +807,7 @@ namespace Nz
 			startCommand->fragments.Set(fragmentNumber, true);
 
 			if (fragmentOffset + fragmentLength > startCommand->packet->data.GetDataSize())
-				fragmentLength = startCommand->packet->data.GetDataSize() - fragmentOffset;
+				fragmentLength = static_cast<UInt16>(startCommand->packet->data.GetDataSize() - fragmentOffset);
 
 			std::memcpy(startCommand->packet->data.GetData() + NetPacket::HeaderSize + fragmentOffset, reinterpret_cast<const UInt8*>(command) + sizeof(ENetProtocolSendFragment), fragmentLength);
 
@@ -1285,7 +1276,7 @@ namespace Nz
 
 	void ENetPeer::SetupOutgoingCommand(OutgoingCommand& outgoingCommand)
 	{
-		m_outgoingDataTotal += ENetHost::GetCommandSize(outgoingCommand.command.header.command) + outgoingCommand.fragmentLength;
+		m_outgoingDataTotal += static_cast<UInt32>(ENetHost::GetCommandSize(outgoingCommand.command.header.command) + outgoingCommand.fragmentLength);
 
 		if (outgoingCommand.command.header.channelID == 0xFF)
 		{