diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c
index d8df93820e..599db75b8a 100644
--- a/bin/tests/makejournal.c
+++ b/bin/tests/makejournal.c
@@ -98,12 +98,12 @@ main(int argc, char **argv) {
 	CHECK(isc_mem_create(0, 0, &mctx));
 	CHECK(isc_entropy_create(mctx, &ectx));
 
-	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-	hash_active = ISC_TRUE;
-
 	CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
 	dst_active = ISC_TRUE;
 
+	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
+	hash_active = ISC_TRUE;
+
 	CHECK(isc_log_create(mctx, &lctx, &logconfig));
 	isc_log_registercategories(lctx, categories);
 	isc_log_setcontext(lctx);
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index c1204495a2..c895f1b56d 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1934,12 +1934,11 @@ main(int argc, char *argv[]) {
 
 	ectx = NULL;
 	RUNCHECK(isc_entropy_create(mctx, &ectx));
+	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
 	RUNCHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
 	RUNCHECK(isc_entropy_getdata(ectx, cookie_secret,
 				     sizeof(cookie_secret), NULL, 0));
 
-	RUNCHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_GOODONLY));
-
 	ISC_LIST_INIT(queries);
 	parse_args(ISC_FALSE, argc, argv);
 	if (server == NULL)
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index fd73683b47..fd265c53ec 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -96,6 +96,8 @@ initialize(void) {
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_dst;
 
+	isc_hash_init();
+
 	initialize_done = ISC_TRUE;
 	return;
 
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index d8973abe21..0e5a9baf9c 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -22,7 +22,6 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id$
  */
 #ifdef OPENSSL
 
@@ -294,8 +293,8 @@ dst__openssl_init(const char *engine) {
 	/* Protect ourselves against unseeded PRNG */
 	if (RAND_status() != 1) {
 		FATAL_ERROR(__FILE__, __LINE__,
-			    "The OpenSSL pseudo random number generator "
-			    "cannot be initialized (cf the `PRNG not "
+			    "OpenSSL pseudorandom number generator "
+			    "cannot be initialized (see the `PRNG not "
 			    "seeded' message in the OpenSSL FAQ)");
 	}
 
diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c
index 9eb00f5435..4a9f20e464 100644
--- a/lib/ns/tests/nstest.c
+++ b/lib/ns/tests/nstest.c
@@ -235,12 +235,12 @@ ns_test_begin(FILE *logfile, isc_boolean_t start_managers) {
 	CHECK(isc_mem_create(0, 0, &mctx));
 	CHECK(isc_entropy_create(mctx, &ectx));
 
-	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
-	hash_active = ISC_TRUE;
-
 	CHECK(dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING));
 	dst_active = ISC_TRUE;
 
+	CHECK(isc_hash_create(mctx, ectx, DNS_NAME_MAXWIRE));
+	hash_active = ISC_TRUE;
+
 	if (logfile != NULL) {
 		isc_logdestination_t destination;
 		isc_logconfig_t *logconfig = NULL;