diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 587d72a01..5f4b2063d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -24,7 +24,7 @@ jobs:
         gcc --version
         cmake --version
         mkdir ascemu_build_сlassic
-        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Classic
+        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Classic
         make -j 4 && make install
 
   TBC:
@@ -44,7 +44,7 @@ jobs:
         gcc --version
         cmake --version
         mkdir ascemu_build_tbc
-        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=TBC
+        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=TBC
         make -j 4 && make install
   WotLK:
     runs-on: ubuntu-latest
@@ -63,7 +63,7 @@ jobs:
         gcc --version
         cmake --version
         mkdir ascemu_build_wotlk
-        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=WotLK
+        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=WotLK
         make -j 4 && make install
   Cata:
     runs-on: ubuntu-latest
@@ -82,7 +82,7 @@ jobs:
         gcc --version
         cmake --version
         mkdir ascemu_build_cata
-        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Cata
+        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Cata
         make -j 4 && make install
   Mop:
     runs-on: ubuntu-latest
@@ -101,5 +101,5 @@ jobs:
         gcc --version
         cmake --version
         mkdir ascemu_build_mop
-        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Mop
+        cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Mop
         make -j 4 && make install
diff --git a/src/tools/ToolsCataMop/mmaps_generator/MapBuilder.h b/src/tools/ToolsCataMop/mmaps_generator/MapBuilder.h
index 9f139fafc..d0982eb73 100644
--- a/src/tools/ToolsCataMop/mmaps_generator/MapBuilder.h
+++ b/src/tools/ToolsCataMop/mmaps_generator/MapBuilder.h
@@ -45,8 +45,7 @@ private:
     std::atomic<bool> _shutdown;
 
 public:
-
-    ProducerConsumerQueue<T>() : _shutdown(false) { }
+    ProducerConsumerQueue() : _shutdown(false) { }
 
     void Push(const T& value)
     {
@@ -231,7 +230,7 @@ namespace MMAP
             rcContext* m_rcContext;
 
             std::vector<std::thread> _workerThreads;
-            ProducerConsumerQueue<uint32> _queue;
+            ProducerConsumerQueue<uint32_t> _queue;
             std::atomic<bool> _cancelationToken;
     };
 }
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index c701c20e3..d2adc5f12 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -45,8 +45,7 @@ private:
     std::atomic<bool> _shutdown;
 
 public:
-
-    ProducerConsumerQueue<T>() : _shutdown(false) { }
+    ProducerConsumerQueue() : _shutdown(false) { }
 
     void Push(const T& value)
     {
@@ -231,7 +230,7 @@ namespace MMAP
             rcContext* m_rcContext;
 
             std::vector<std::thread> _workerThreads;
-            ProducerConsumerQueue<uint32> _queue;
+            ProducerConsumerQueue<uint32_t> _queue;
             std::atomic<bool> _cancelationToken;
     };
 }