diff --git a/Destination.h b/Destination.h
index 8ff2dbc8..ece125e3 100644
--- a/Destination.h
+++ b/Destination.h
@@ -28,7 +28,7 @@ namespace client
 	const int PUBLISH_CONFIRMATION_TIMEOUT = 5; // in seconds
 	const int LEASESET_REQUEST_TIMEOUT = 5; // in seconds
 	const int MAX_LEASESET_REQUEST_TIMEOUT = 40; // in seconds
-	const int DESTINATION_CLEANUP_TIMEOUT = 20; // in minutes 
+	const int DESTINATION_CLEANUP_TIMEOUT = 3; // in minutes 
 	const unsigned int MAX_NUM_FLOODFILLS_PER_REQUEST = 7;
 	
 	// I2CP
diff --git a/Garlic.cpp b/Garlic.cpp
index 1bd5cc3f..d62b6fe3 100644
--- a/Garlic.cpp
+++ b/Garlic.cpp
@@ -97,7 +97,7 @@ namespace garlic
 		// delete expired unconfirmed tags
 		for (auto it = m_UnconfirmedTagsMsgs.begin (); it != m_UnconfirmedTagsMsgs.end ();)
 		{
-			if (ts >= it->second->tagsCreationTime + OUTGOING_TAGS_EXPIRATION_TIMEOUT)
+			if (ts >= it->second->tagsCreationTime + OUTGOING_TAGS_CONFIRMATION_TIMEOUT)
 			{
 				if (m_Owner)
 					m_Owner->RemoveDeliveryStatusSession (it->first);
@@ -107,7 +107,7 @@ namespace garlic
 			else
 				it++;
 		}	
-		return !m_SessionTags.empty () || m_UnconfirmedTagsMsgs.empty ();
+		return !m_SessionTags.empty () || !m_UnconfirmedTagsMsgs.empty ();
  	}
 
 	std::shared_ptr<I2NPMessage> GarlicRoutingSession::WrapSingleMessage (std::shared_ptr<const I2NPMessage> msg)
diff --git a/Garlic.h b/Garlic.h
index 1bfcab7c..67e9b027 100644
--- a/Garlic.h
+++ b/Garlic.h
@@ -38,6 +38,7 @@ namespace garlic
 
 	const int INCOMING_TAGS_EXPIRATION_TIMEOUT = 960; // 16 minutes			
 	const int OUTGOING_TAGS_EXPIRATION_TIMEOUT = 720; // 12 minutes
+	const int OUTGOING_TAGS_CONFIRMATION_TIMEOUT = 10; // 10 seconds 
 	const int LEASET_CONFIRMATION_TIMEOUT = 4000; // in milliseconds
 	
 	struct SessionTag: public i2p::data::Tag<32>