diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
index 750f59c1..f16b2a07 100644
--- a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-ea227a21dcaed2f54d61bd9175c6deb02480ebd894ebd589061556a1708c0c9f  /usr/local/bin/tox-bootstrapd
+624c610327a1288eb58196fb0e93d98d5a3c01ad86835799b90c1936fcbbc156  /usr/local/bin/tox-bootstrapd
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index fd7ca57e..22053700 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -2598,11 +2598,12 @@ uint16_t randfriends_nodes(const DHT *dht, Node_format *nodes, uint16_t max_num)
         return 0;
     }
 
+    assert(dht->num_friends >= DHT_FAKE_FRIEND_NUMBER);
+    const uint32_t r = random_range_u32(dht->rng, dht->num_friends - DHT_FAKE_FRIEND_NUMBER);
     uint16_t count = 0;
-    const uint32_t r = random_u32(dht->rng);
 
     for (size_t i = 0; i < DHT_FAKE_FRIEND_NUMBER; ++i) {
-        count += list_nodes(dht->rng, dht->friends_list[(i + r) % DHT_FAKE_FRIEND_NUMBER].client_list,
+        count += list_nodes(dht->rng, dht->friends_list[r + i].client_list,
                             MAX_FRIEND_CLIENTS, dht->cur_time,
                             nodes + count, max_num - count);
 
diff --git a/toxcore/crypto_core.c b/toxcore/crypto_core.c
index ccfda08d..7d9ed020 100644
--- a/toxcore/crypto_core.c
+++ b/toxcore/crypto_core.c
@@ -501,6 +501,10 @@ non_null()
 static uint32_t sys_random_uniform(void *obj, uint32_t upper_bound)
 {
 #ifdef VANILLA_NACL
+    if (upper_bound == 0) {
+        return 0;
+    }
+
     uint32_t randnum;
     sys_random_bytes(obj, (uint8_t *)&randnum, sizeof(randnum));
     return randnum % upper_bound;