diff --git a/libi2pd/Reseed.cpp b/libi2pd/Reseed.cpp
index 6cf277bf..e58e898b 100644
--- a/libi2pd/Reseed.cpp
+++ b/libi2pd/Reseed.cpp
@@ -641,9 +641,9 @@ namespace data
 			if (!ecode)
 			{
 				bool connected = false;
-				for (auto it = endpoints.begin (); it != endpoints.end ();)
+				for (const auto& it: endpoints)
 				{
-					boost::asio::ip::tcp::endpoint ep = *it;
+					boost::asio::ip::tcp::endpoint ep = it;
 					bool supported = false;
 					if (!ep.address ().is_unspecified ())
 					{
@@ -663,7 +663,6 @@ namespace data
 							break;
 						}
 					}
-					it++;
 				}
 				if (!connected)
 				{
@@ -750,9 +749,9 @@ namespace data
 		if (!ecode)
 		{
 			bool connected = false;
-			for (auto it = endpoints.begin (); it != endpoints.end ();)
+			for (const auto& it: endpoints)
 			{
-				boost::asio::ip::tcp::endpoint ep = *it;
+				boost::asio::ip::tcp::endpoint ep = it;
 				if (
 					i2p::util::net::IsYggdrasilAddress (ep.address ()) &&
 					i2p::context.SupportsMesh ()
@@ -766,7 +765,6 @@ namespace data
 						break;
 					}
 				}
-				it++;
 			}
 			if (!connected)
 			{
diff --git a/libi2pd/Timestamp.cpp b/libi2pd/Timestamp.cpp
index 210ef3b9..a22e9bde 100644
--- a/libi2pd/Timestamp.cpp
+++ b/libi2pd/Timestamp.cpp
@@ -67,9 +67,9 @@ namespace util
 		{
 			bool found = false;
 			boost::asio::ip::udp::endpoint ep;
-			for (auto it = endpoints.begin (); it != endpoints.end ();)
+			for (const auto& it: endpoints)
 			{
-				ep = *it;
+				ep = it;
 				if (!ep.address ().is_unspecified ())
 				{
 					if (ep.address ().is_v4 ())
@@ -86,7 +86,6 @@ namespace util
 					}
 				}
 				if (found) break;
-				it++;
 			}
 			if (!found)
 			{
diff --git a/libi2pd_client/I2PTunnel.cpp b/libi2pd_client/I2PTunnel.cpp
index ed0533a7..bbe09508 100644
--- a/libi2pd_client/I2PTunnel.cpp
+++ b/libi2pd_client/I2PTunnel.cpp
@@ -752,9 +752,9 @@ namespace client
 			boost::asio::ip::tcp::endpoint ep;
 			if (m_LocalAddress)
 			{
-				for (auto it = endpoints.begin (); it != endpoints.end ();)
+				for (const auto& it: endpoints)
 				{
-					ep = *it;
+					ep = it;
 					if (!ep.address ().is_unspecified ())
 					{
 						if (ep.address ().is_v4 ())
@@ -773,7 +773,6 @@ namespace client
 						}
 					}
 					if (found) break;
-					it++;
 				}
 			}
 			else