diff --git a/core/Messenger.c b/core/Messenger.c
index 37e369fa..2e381f81 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -282,7 +282,7 @@ static void doFriends()
             {
                  if(temp[0] == 64)
                  {
-                     (*friend_message)(i, temp, len);
+                     (*friend_message)(i, temp + 1, len - 1);
                  }
             }
             else
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 6be90875..3e8858dc 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -2,8 +2,10 @@
  * 
  * A simple DHT boostrap server for tox.
  * 
- * Build command: gcc -O2 -Wall -D VANILLA_NACL -o bootstrap_server ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_bootstrap.c
- * 
+ * Build commands (use one or the other): 
+ *                gcc -O2 -Wall -D VANILLA_NACL -o bootstrap_server ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c ../nacl/build/${HOSTNAME%.*}/lib/amd64/{cpucycles.o,libnacl.a,randombytes.o} DHT_bootstrap.c
+ *                
+ *                gcc -O2 -Wall -o bootstrap_server ../core/Lossless_UDP.c ../core/network.c ../core/net_crypto.c ../core/Messenger.c ../core/DHT.c -lsodium DHT_bootstrap.c
  */
 
 #include "../core/DHT.h"