diff --git a/client/rpc_client.go b/client/rpc_client.go
index ea63041e..39d044d9 100644
--- a/client/rpc_client.go
+++ b/client/rpc_client.go
@@ -280,16 +280,16 @@ func (r *rpcClient) next(request Request, opts CallOptions) (selector.Next, erro
 
 	// return remote address
 	if len(opts.Address) > 0 {
-		var nodes []*registry.Node
+		nodes := make([]*registry.Node, len(opts.Address))
 
-		for _, address := range opts.Address {
-			nodes = append(nodes, &registry.Node{
+		for i, address := range opts.Address {
+			nodes[i] = &registry.Node{
 				Address: address,
 				// Set the protocol
 				Metadata: map[string]string{
 					"protocol": "mucp",
 				},
-			})
+			}
 		}
 
 		// crude return method
diff --git a/server/rpc_server.go b/server/rpc_server.go
index 696151e3..533def1e 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -405,6 +405,7 @@ func (s *rpcServer) Register() error {
 		if err != nil {
 			return err
 		}
+		log.Logf("Subscribing %s to topic: %s", node.Id, sub.Topic())
 		s.subscribers[sb] = []broker.Subscriber{sub}
 	}
 
@@ -465,7 +466,7 @@ func (s *rpcServer) Deregister() error {
 
 	for sb, subs := range s.subscribers {
 		for _, sub := range subs {
-			log.Logf("Unsubscribing from topic: %s", sub.Topic())
+			log.Logf("Unsubscribing %s from topic: %s", node.Id, sub.Topic())
 			sub.Unsubscribe()
 		}
 		s.subscribers[sb] = nil