diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8583b0463..38ff72e0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ find_package(libuv CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(recastnavigation CONFIG REQUIRED)
 find_package(ZLIB REQUIRED)
-pkg_check_modules(luajit REQUIRED luajit)
+pkg_check_modules(luajit REQUIRED IMPORTED_TARGET luajit)
 find_package(PerlLibs)
 
 MESSAGE(STATUS "**************************************************")
@@ -241,7 +241,7 @@ IF(LUA_LIBRARY_ENABLED)
 
 	IF(EQEMU_BUILD_LUA)
 		ADD_DEFINITIONS(-DLUA_EQEMU)
-		SET(ZONE_LIBS ${pkgcfg_lib_luajit_lua51})
+		#SET(ZONE_LIBS ${pkgcfg_lib_luajit_lua51})
 		include_directories(SYSTEM "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/luajit" "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
 
 		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
@@ -294,7 +294,7 @@ ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS)
 IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(shared_memory)
 	ADD_SUBDIRECTORY(world)
-#	ADD_SUBDIRECTORY(zone)
+	ADD_SUBDIRECTORY(zone)
 	ADD_SUBDIRECTORY(ucs)
 	ADD_SUBDIRECTORY(queryserv)
 	ADD_SUBDIRECTORY(eqlaunch)
diff --git a/libs/luabind/CMakeLists.txt b/libs/luabind/CMakeLists.txt
index 7410cf506..f891185a7 100644
--- a/libs/luabind/CMakeLists.txt
+++ b/libs/luabind/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(lb_headers
 )
 
 add_library(luabind ${lb_sources} ${lb_headers})
-target_link_libraries(luabind PRIVATE luajit Boost::dynamic_bitset Boost::tuple Boost::foreach)
+target_link_libraries(luabind PRIVATE PkgConfig::luajit Boost::dynamic_bitset Boost::tuple Boost::foreach)
 
 IF(UNIX)
     set_source_files_properties(${lb_sources} PROPERTY COMPILE_FLAGS -Wno-deprecated-declarations)
diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index ffea99f78..6e1cb4743 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -472,6 +472,7 @@ set(gm_command_sources
 )
 
 add_library(gm_commands_zone STATIC ${gm_command_sources})
+target_link_libraries(gm_commands_zone PRIVATE cereal::cereal fmt::fmt $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> unofficial::libmariadb)
 set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
 
 # zone combine sources and headers
@@ -490,19 +491,23 @@ ENDIF()
 ADD_DEFINITIONS(-DZONE)
 
 # link lua_zone unity build against luabind
-target_link_libraries(lua_zone PRIVATE luabind)
+IF(MSVC)
+    target_compile_options(lua_zone PRIVATE /utf-8)
+ENDIF(MSVC)
+
+target_link_libraries(lua_zone PRIVATE luabind Boost::dynamic_bitset Boost::tuple Boost::foreach unofficial::libmariadb)
 if (EQEMU_BUILD_STATIC AND LUA_LIBRARY)
     target_link_libraries(zone PRIVATE ${LUA_LIBRARY})
 endif()
 
 # perl unity build links against perl_zone
-target_link_libraries(perl_zone PRIVATE perlbind)
+target_link_libraries(perl_zone PRIVATE perlbind fmt::fmt unofficial::libmariadb)
 if (EQEMU_BUILD_STATIC AND PERL_LIBRARY)
     target_link_libraries(zone PRIVATE ${PERL_LIBRARY})
 endif()
 
 # link zone against common libraries
-target_link_libraries(zone PRIVATE lua_zone perl_zone gm_commands_zone ${ZONE_LIBS})
+target_link_libraries(zone PRIVATE lua_zone perl_zone gm_commands_zone ${ZONE_LIBS} RecastNavigation::Detour)
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
diff --git a/zone/pathfinder_nav_mesh.cpp b/zone/pathfinder_nav_mesh.cpp
index 22dd12249..5cf89f091 100644
--- a/zone/pathfinder_nav_mesh.cpp
+++ b/zone/pathfinder_nav_mesh.cpp
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <vector>
 #include "pathfinder_nav_mesh.h"
-#include <DetourCommon.h>
-#include <DetourNavMeshQuery.h>
+#include <recastnavigation/DetourCommon.h>
+#include <recastnavigation/DetourNavMeshQuery.h>
 
 #include "zone.h"
 #include "water_map.h"
diff --git a/zone/pathfinder_nav_mesh.h b/zone/pathfinder_nav_mesh.h
index 9f7bf4120..3b10cc23c 100644
--- a/zone/pathfinder_nav_mesh.h
+++ b/zone/pathfinder_nav_mesh.h
@@ -2,7 +2,7 @@
 
 #include "pathfinder_interface.h"
 #include <string>
-#include <DetourNavMesh.h>
+#include <recastnavigation/DetourNavMesh.h>
 
 class PathfinderNavmesh : public IPathfinder
 {