diff --git a/Destination.cpp b/Destination.cpp
index 9b02f3fb..df6fe152 100644
--- a/Destination.cpp
+++ b/Destination.cpp
@@ -139,7 +139,6 @@ namespace client
 			auto ls = i2p::data::netdb.FindLeaseSet (ident);
 			if (ls)
 			{
-				ls = std::make_shared<i2p::data::LeaseSet> (*ls);
 				m_RemoteLeaseSets[ident] = ls;			
 				return ls;
 			}	
diff --git a/Tunnel.cpp b/Tunnel.cpp
index fe983ae1..229a43b8 100644
--- a/Tunnel.cpp
+++ b/Tunnel.cpp
@@ -351,9 +351,10 @@ namespace tunnel
 				if (msg)
 				{	
 					uint32_t prevTunnelID = 0, tunnelID = 0;
-					TunnelBase * prevTunnel = nullptr, * tunnel = nullptr;
+					TunnelBase * prevTunnel = nullptr; 
 					do
 					{
+						TunnelBase * tunnel = nullptr;
 						uint8_t typeID = msg->GetTypeID ();
 						switch (typeID)
 						{