diff --git a/.gitignore b/.gitignore
index 0bde88a87..f3a791462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ Testing/
 ve/
 release/memgraph_*
 release/libs/
+release/barrier/
diff --git a/include/query_engine/code_generator.hpp b/include/query_engine/code_generator.hpp
index a3560d224..704385ddb 100644
--- a/include/query_engine/code_generator.hpp
+++ b/include/query_engine/code_generator.hpp
@@ -60,7 +60,7 @@ public:
                             {"stripped_hash", std::to_string(stripped_hash)},
                             {"query", query},
 #ifdef BARRIER
-                            {"stream", "RecordStream<io::Socket>"},
+                            {"stream", "RecordStream<::io::Socket>"},
 #else
                             {"stream", type_name<Stream>().to_string()},
 #endif
diff --git a/include/query_engine/i_code_cpu.hpp b/include/query_engine/i_code_cpu.hpp
index a8bd115f8..b78ca803d 100644
--- a/include/query_engine/i_code_cpu.hpp
+++ b/include/query_engine/i_code_cpu.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "communication/communication.hpp"
 #include "query_engine/query_stripped.hpp"
 
 #ifdef BARRIER
 #include "barrier/barrier.hpp"
+#include "io/network/socket.hpp"
 #else
+#include "communication/communication.hpp"
 #include "database/db.hpp"
 #include "database/db_accessor.hpp"
 #endif
diff --git a/include/query_engine/traverser/code.hpp b/include/query_engine/traverser/code.hpp
index 23b8d6b5d..72cf7cc0c 100644
--- a/include/query_engine/traverser/code.hpp
+++ b/include/query_engine/traverser/code.hpp
@@ -74,7 +74,7 @@ const std::string write_all_vertices =
 const std::string find_and_write_vertices_by_label =
         "auto &label = t.label_find_or_create(\"{1}\");\n"
         "        stream.write_field(\"{0}\");\n"
-        "        label.index().for_range(t)->for_all([&](auto vertex) {{\n"
+        "        label.index().for_range(t).for_all([&](auto vertex) {{\n"
         "            stream.write_record();\n"
         "            stream.write_list_header(1);\n"
         "            stream.write(vertex);\n"
@@ -97,7 +97,7 @@ const std::string write_all_edges =
 const std::string find_and_write_edges_by_type =
         "auto &type = t.type_find_or_create(\"{1}\");\n"
         "        stream.write_field(\"{0}\");\n"
-        "        type.index().for_range(t)->for_all([&](auto edge) {{\n"
+        "        type.index().for_range(t).for_all([&](auto edge) {{\n"
         "            stream.write_record();\n"
         "            stream.write_list_header(1);\n"
         "            stream.write(edge);\n"
diff --git a/src/query_engine/template/barrier_template_code_cpu.cpp b/src/query_engine/template/barrier_template_code_cpu.cpp
index 74b1e30b8..e06dcc856 100644
--- a/src/query_engine/template/barrier_template_code_cpu.cpp
+++ b/src/query_engine/template/barrier_template_code_cpu.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <string>
 
-#include "query_engine/util.hpp"
 #include "query_engine/i_code_cpu.hpp"
 #include "storage/model/properties/all.hpp"