diff --git a/src/communication/server.hpp b/src/communication/server.hpp
index f734dd9fd..0b4c8ad40 100644
--- a/src/communication/server.hpp
+++ b/src/communication/server.hpp
@@ -61,7 +61,7 @@ class Server
     workers_.reserve(n);
     for (size_t i = 0; i < n; ++i) {
       workers_.push_back(
-          std::make_shared<Worker<Session, OutputStream, Socket>>(
+          std::make_unique<Worker<Session, OutputStream, Socket>>(
               dbms_, query_engine_));
       workers_.back()->Start(alive_);
     }
@@ -91,7 +91,7 @@ class Server
 
     if (UNLIKELY(!workers_[idx_]->Accept(socket_))) return;
 
-    idx_ = idx_ == (int)workers_.size() - 1 ? 0 : idx_ + 1;
+    idx_ = idx_ == static_cast<int>(workers_.size()) - 1 ? 0 : idx_ + 1;
   }
 
   void OnWaitTimeout() {}
@@ -103,7 +103,7 @@ class Server
   }
 
   template <class... Args>
-  void OnExceptionEvent(Event &event, Args &&... args) {
+  void OnExceptionEvent(Event &, Args &&...) {
     // TODO: Do something about it
     DLOG(WARNING) << "epoll exception";
   }
@@ -113,7 +113,7 @@ class Server
   void OnErrorEvent(Event &event) { close(event.data.fd); }
 
  private:
-  std::vector<typename Worker<Session, OutputStream, Socket>::sptr> workers_;
+  std::vector<typename Worker<Session, OutputStream, Socket>::uptr> workers_;
   std::atomic<bool> alive_{true};
   int idx_{0};
 
diff --git a/src/communication/worker.hpp b/src/communication/worker.hpp
index cd401a8d4..5f91080e2 100644
--- a/src/communication/worker.hpp
+++ b/src/communication/worker.hpp
@@ -42,7 +42,7 @@ class Worker
   using StreamBuffer = io::network::StreamBuffer;
 
  public:
-  using sptr = std::shared_ptr<Worker<Session, OutputStream, Socket>>;
+  using uptr = std::unique_ptr<Worker<Session, OutputStream, Socket>>;
 
   Worker(Dbms &dbms, QueryEngine<OutputStream> &query_engine)
       : dbms_(dbms), query_engine_(query_engine) {}
@@ -86,7 +86,7 @@ class Worker
   }
 
   template <class... Args>
-  void OnException(Session &session, Args &&... args) {
+  void OnException(Session &, Args &&...) {
     LOG(ERROR) << "Error occured in this session";
 
     // TODO: Do something about it
diff --git a/src/memgraph_bolt.cpp b/src/memgraph_bolt.cpp
index 282299e4b..0c36fb718 100644
--- a/src/memgraph_bolt.cpp
+++ b/src/memgraph_bolt.cpp
@@ -62,7 +62,7 @@ void load_config(int &argc, char **&argv) {
   char **custom_argv = new char *[custom_argc];
 
   custom_argv[0] = strdup(std::string("memgraph").c_str());
-  for (int i = 0; i < (int)flagfile_arguments.size(); ++i) {
+  for (int i = 0; i < static_cast<int>(flagfile_arguments.size()); ++i) {
     custom_argv[i + 1] = strdup(flagfile_arguments[i].c_str());
   }