diff --git a/famtool.cpp b/famtool.cpp
index 81d5c00..506b318 100644
--- a/famtool.cpp
+++ b/famtool.cpp
@@ -197,7 +197,7 @@ int main(int argc, char * argv[])
     return 0;
   }
   
-  InitCrypto(false);
+  InitCrypto(false, true, true, false);
   
   if(!fam.size()) {
     // no family name
diff --git a/i2pd b/i2pd
index c4c896a..8b3a748 160000
--- a/i2pd
+++ b/i2pd
@@ -1 +1 @@
-Subproject commit c4c896a833d006f308f35d31ed006e82a3b769f2
+Subproject commit 8b3a7486c74b27199a08dc500e2a19dfe16e53a0
diff --git a/keygen.cpp b/keygen.cpp
index deab96c..e35bc18 100644
--- a/keygen.cpp
+++ b/keygen.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		std::cout << "Usage: keygen filename <signature type>" << std::endl;
 		return -1;
 	}
-	i2p::crypto::InitCrypto (false);
+	i2p::crypto::InitCrypto (false, true, true, false);
 	i2p::data::SigningKeyType type = i2p::data::SIGNING_KEY_TYPE_DSA_SHA1;	
 	if (argc > 2) {
 		std::string str(argv[2]);
diff --git a/offlinekeys.cpp b/offlinekeys.cpp
index dac8112..8117db2 100644
--- a/offlinekeys.cpp
+++ b/offlinekeys.cpp
@@ -14,7 +14,7 @@ int main (int argc, char * argv[])
 		std::cout << "Usage: offlinekeys <output file> <keys file> <signature type> <days>" << std::endl;
 		return -1;
 	}
-	i2p::crypto::InitCrypto (false);
+	i2p::crypto::InitCrypto (false, true, true, false);
 
 	std::string fname(argv[2]);
 	i2p::data::PrivateKeys keys;
diff --git a/regaddr.cpp b/regaddr.cpp
index 9a58c8a..b9d58e9 100644
--- a/regaddr.cpp
+++ b/regaddr.cpp
@@ -12,7 +12,7 @@ int main (int argc, char * argv[])
 		return -1;
 	}
 
-	i2p::crypto::InitCrypto (false);	
+	i2p::crypto::InitCrypto (false, true, true, false);	
 
 	i2p::data::PrivateKeys keys;
 	std::ifstream s(argv[1], std::ifstream::binary);
diff --git a/regaddr_3ld.cpp b/regaddr_3ld.cpp
index 4c94b09..bb1c703 100644
--- a/regaddr_3ld.cpp
+++ b/regaddr_3ld.cpp
@@ -18,7 +18,7 @@ int main (int argc, char * argv[])
 	if (argc < 3) {	help(); return -1;}
 	std::string arg = argv[1];
 
-	i2p::crypto::InitCrypto (false);
+	i2p::crypto::InitCrypto (false, true, true, false);
 	i2p::data::PrivateKeys keys;
 
 	if (arg == "step1") {
diff --git a/routerinfo.cpp b/routerinfo.cpp
index 572416b..9f27289 100644
--- a/routerinfo.cpp
+++ b/routerinfo.cpp
@@ -46,7 +46,7 @@ int main(int argc, char * argv[])
 		usage(argv[0]);
 		return 1;
 	}
-	i2p::crypto::InitCrypto(false);
+	i2p::crypto::InitCrypto(false, true, true, false);
 	int opt;
 	bool ipv6 = false;
 	bool firewall = false;
@@ -75,7 +75,7 @@ int main(int argc, char * argv[])
 		i2p::data::RouterInfo ri(fname);
 		
 		std::vector<std::shared_ptr<const i2p::data::RouterInfo::Address> > addrs;
-		auto a = ri.GetNTCPAddress(!ipv6);
+		auto a = ri.GetNTCP2Address(!ipv6);
 		if(a)
 			addrs.push_back(a);
 		a = ri.GetSSUAddress(!ipv6);
diff --git a/vanitygen.cpp b/vanitygen.cpp
index 2721e2a..1834abd 100644
--- a/vanitygen.cpp
+++ b/vanitygen.cpp
@@ -299,7 +299,7 @@ int main (int argc, char * argv[])
 //		}
 	}
 
-	i2p::crypto::InitCrypto (false);
+	i2p::crypto::InitCrypto (false, true, true, false);
 	options.signature = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519;
 ///////////////
 //For while