diff --git a/routing/chainview/queue.go b/routing/chainview/queue.go
index 5d86c3c1..b1d6a20c 100644
--- a/routing/chainview/queue.go
+++ b/routing/chainview/queue.go
@@ -72,7 +72,6 @@ func (b *blockEventQueue) Stop() {
 	close(b.quit)
 
 	b.queueCond.Signal()
-	b.wg.Wait()
 }
 
 // queueCoordinator is the queue's main loop, handling incoming block events
diff --git a/rpcserver.go b/rpcserver.go
index 085b3a6b..63e785c1 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2173,7 +2173,7 @@ func (r *rpcServer) GetTransactions(ctx context.Context,
 		}
 	}
 
-	// TODO(btcsuite): add pagination support
+	// TODO(roasbeef): add pagination support
 	transactions, err := r.server.cc.wallet.ListTransactionDetails()
 	if err != nil {
 		return nil, err