diff --git a/common/event/event_loop.h b/common/event/event_loop.h
index 2f949ef41..e65b0fb08 100644
--- a/common/event/event_loop.h
+++ b/common/event/event_loop.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <functional>
 #include <uv.h>
+#include <cstring>
 
 namespace EQ
 {
diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp
index 89b8edef7..8b994c43b 100644
--- a/common/net/daybreak_connection.cpp
+++ b/common/net/daybreak_connection.cpp
@@ -967,7 +967,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 			}
 		}
 		else {
-			if ((size_t)time_since_last_send.count() > std::min(m_resend_delay / (entry.second.times_resent + 1), 5ULL)) {
+			if ((size_t)time_since_last_send.count() > std::min(m_resend_delay / (entry.second.times_resent + 1), (size_t)5ULL)) {
 				InternalBufferedSend(entry.second.packet);
 				entry.second.last_sent = now;
 				entry.second.times_resent++;
diff --git a/common/tcp_server.cpp b/common/tcp_server.cpp
index e62bf892d..d632fb399 100644
--- a/common/tcp_server.cpp
+++ b/common/tcp_server.cpp
@@ -14,7 +14,7 @@
 	#include <arpa/inet.h>
 	#include <errno.h>
 	#include <fcntl.h>
-#include "net\tcp_server.h"
+
 #define INVALID_SOCKET -1
 	#define SOCKET_ERROR -1
 #endif
diff --git a/loginserver/server_manager.cpp b/loginserver/server_manager.cpp
index 189eb663f..cdde5670e 100644
--- a/loginserver/server_manager.cpp
+++ b/loginserver/server_manager.cpp
@@ -48,7 +48,7 @@ ServerManager::ServerManager()
 			server_entity->Reset();
 		}
 		else {
-			world_servers.push_back(std::make_unique<WorldServer>(c));
+			world_servers.push_back(std::unique_ptr<WorldServer>(new WorldServer(c)));
 		}
 
 	});
@@ -261,4 +261,4 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
 
 		++iter;
 	}
-}
\ No newline at end of file
+}