diff --git a/src/crypto.cpp b/src/crypto.cpp
index 21b39ea..2c1079a 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -37,7 +37,9 @@ class RandomBytes
 public:
 	RandomBytes() : rng(RandomDeviceSeed::instance), dist(0, 255)
 	{
-		uv_mutex_init_checked(&m);
+		if (uv_mutex_init(&m) != 0) {
+			abort();
+		}
 
 		// Diffuse the initial state in case it has low quality
 		rng.discard(10000);
diff --git a/src/p2p_server.cpp b/src/p2p_server.cpp
index 602b1ee..5e1f9e0 100644
--- a/src/p2p_server.cpp
+++ b/src/p2p_server.cpp
@@ -178,7 +178,7 @@ void P2PServer::clear_cached_blocks()
 		return;
 	}
 
-	for (auto it : *m_cachedBlocks) {
+	for (const auto& it : *m_cachedBlocks) {
 		delete it.second;
 	}