diff --git a/NetDb.cpp b/NetDb.cpp
index c5956dd8..870027e7 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -169,7 +169,7 @@ namespace data
 				{
 					for (boost::filesystem::directory_iterator it1 (it->path ()); it1 != end; ++it1)
 					{
-#ifdef BOOST_VERSION > 10500
+#if BOOST_VERSION > 10500
 						RouterInfo * r = new RouterInfo (it1->path().string().c_str ());
 #else
 						RouterInfo * r = new RouterInfo(it1->path().c_str());
diff --git a/Streaming.cpp b/Streaming.cpp
index 4ca4b49b..79feedeb 100644
--- a/Streaming.cpp
+++ b/Streaming.cpp
@@ -124,7 +124,7 @@ namespace stream
 		
 	void StreamingDestination::HandleNextPacket (const uint8_t * buf, size_t len)
 	{
-		uint32_t sendStreamID = *(uint32_t *)(buf);
+		uint32_t sendStreamID = be32toh (*(uint32_t *)(buf));
 		auto it = m_Streams.find (sendStreamID);
 		if (it != m_Streams.end ())
 			it->second->HandleNextPacket (buf, len);
diff --git a/Tunnel.cpp b/Tunnel.cpp
index 4e43e70d..2a87a939 100644
--- a/Tunnel.cpp
+++ b/Tunnel.cpp
@@ -1,5 +1,5 @@
 #include "I2PEndian.h"
-#include <boost/thread.hpp>
+#include <thread>
 #include <cryptopp/sha.h>
 #include "RouterContext.h"
 #include "Log.h"
@@ -260,7 +260,7 @@ namespace tunnel
 
 	void Tunnels::Run ()
 	{
-		boost::this_thread::sleep(boost::posix_time::seconds(1)); // wait for other parts are ready
+		std::this_thread::sleep_for (std::chrono::seconds(1)); // wait for other parts are ready
 		
 		uint64_t lastTs = 0;
 		while (m_IsRunning)