diff --git a/cubic-server/Server.cpp b/cubic-server/Server.cpp
index e537f10c7..e7d499790 100644
--- a/cubic-server/Server.cpp
+++ b/cubic-server/Server.cpp
@@ -14,7 +14,10 @@
 
 #include <mbedtls/rsa.h>
 
+#if PROMETHEUS_SUPPORT == 1
 #include "PrometheusExporter.hpp"
+#endif
+
 #include "Server.hpp"
 #include "World.hpp"
 
diff --git a/cubic-server/math/Vector2.hpp b/cubic-server/math/Vector2.hpp
index 5782b26f2..fe0820511 100644
--- a/cubic-server/math/Vector2.hpp
+++ b/cubic-server/math/Vector2.hpp
@@ -126,7 +126,7 @@ class Vector2 {
         return *this;
     }
 
-    constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2<T>(other.x % this->x, other.z % this->y, other.z % this->z); }
+    constexpr Vector2 operator%(const Vector2 &other) noexcept { return Vector2<T>(other.x % this->x, other.z % this->z); }
 
     constexpr Vector2 operator%(const T &other) noexcept { return Vector2<T>(other % this->x, other % this->z); }
 
diff --git a/cubic-server/thread_pool/Pool.cpp b/cubic-server/thread_pool/Pool.cpp
index 448d72280..40ca9d42b 100644
--- a/cubic-server/thread_pool/Pool.cpp
+++ b/cubic-server/thread_pool/Pool.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "Pool.hpp"
 
 thread_pool::Pool::Pool(size_t nbThreads, const std::string &name, const Behavior &behavior):
diff --git a/cubic-server/thread_pool/PriorityThreadPool.hpp b/cubic-server/thread_pool/PriorityThreadPool.hpp
index 1db8db114..f8398e84e 100644
--- a/cubic-server/thread_pool/PriorityThreadPool.hpp
+++ b/cubic-server/thread_pool/PriorityThreadPool.hpp
@@ -4,6 +4,7 @@
 //=============
 // STD includes
 //=============
+#include <algorithm>
 #include <atomic>
 #include <climits>
 #include <cstdint>