diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0c75e6d..e03b0f9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         )
     endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup")
+    # TODO: Clang-specific flags 
 endif()
 
 # Compiler flags customization (by system)
diff --git a/client/i2pcontrol/I2PControlServer.cpp b/client/i2pcontrol/I2PControlServer.cpp
index 0a945c91..88017e25 100644
--- a/client/i2pcontrol/I2PControlServer.cpp
+++ b/client/i2pcontrol/I2PControlServer.cpp
@@ -158,8 +158,8 @@ void I2PControlService::SendResponse(std::shared_ptr<boost::asio::ip::tcp::socke
     );
 }
 
-void I2PControlService::HandleResponseSent(const boost::system::error_code& ecode, std::size_t bytes_transferred,
-    std::shared_ptr<boost::asio::ip::tcp::socket> socket, std::shared_ptr<I2PControlBuffer> buf)
+void I2PControlService::HandleResponseSent(const boost::system::error_code& ecode, std::size_t,
+    std::shared_ptr<boost::asio::ip::tcp::socket> socket, std::shared_ptr<I2PControlBuffer>)
 {
     if(ecode)
         LogPrint(eLogError, "I2PControl write error: ", ecode.message());
diff --git a/client/i2pcontrol/I2PControlServer.h b/client/i2pcontrol/I2PControlServer.h
index 48b84101..e60ee862 100644
--- a/client/i2pcontrol/I2PControlServer.h
+++ b/client/i2pcontrol/I2PControlServer.h
@@ -40,13 +40,13 @@ private:
 
 private:
 
+    std::shared_ptr<I2PControlSession> m_Session;
+
     bool m_IsRunning;
     std::thread * m_Thread; 
 
     boost::asio::io_service m_Service;
     boost::asio::ip::tcp::acceptor m_Acceptor;
-
-    std::shared_ptr<I2PControlSession> m_Session;
     
 };
 }