diff --git a/lnd_test.go b/lnd_test.go
index 5863f2ece..ba5f38959 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -531,6 +531,7 @@ func testSingleHopInvoice(net *networkHarness, t *harnessTest) {
 
 	// With the invoice for Bob added, send a payment towards Alice paying
 	// to the above generated invoice.
+	time.Sleep(time.Millisecond * 500)
 	sendStream, err := net.Alice.SendPayment(ctxb)
 	if err != nil {
 		t.Fatalf("unable to create alice payment stream: %v", err)
diff --git a/rpcserver.go b/rpcserver.go
index 512d0d4e8..254aa13a4 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -1735,6 +1735,8 @@ func (r *rpcServer) GetNetworkInfo(context.Context, *lnrpc.NetworkInfoRequest) (
 		return nil, err
 	}
 
+	// TODO(roasbeef): graph diameter
+
 	// TODO(roasbeef): also add oldest channel?
 	//  * also add median channel size
 	return &lnrpc.NetworkInfo{
diff --git a/server.go b/server.go
index 1b76a7a04..4245ebf69 100644
--- a/server.go
+++ b/server.go
@@ -594,9 +594,11 @@ out:
 						continue
 					}
 
-					for _, msg := range bMsg.msgs {
-						peer.queueMsg(msg, nil)
-					}
+					go func() {
+						for _, msg := range bMsg.msgs {
+							peer.queueMsg(msg, nil)
+						}
+					}()
 				}
 				s.peersMtx.RUnlock()
 
@@ -624,11 +626,11 @@ out:
 					sMsg.errChan <- errors.New("peer not found")
 					return
 				}
+				s.peersMtx.RUnlock()
 
 				for _, msg := range sMsg.msgs {
 					targetPeer.queueMsg(msg, nil)
 				}
-				s.peersMtx.RUnlock()
 
 				sMsg.errChan <- nil
 			}()