diff --git a/core/commands/add.go b/core/commands/add.go
index c98ee14518667cf34da893564a35ff8eeea1c711..f6c5492ad16f0eac006dc680c6d4309f7717e1af 100644
--- a/core/commands/add.go
+++ b/core/commands/add.go
@@ -94,6 +94,7 @@ func addDir(n *core.IpfsNode, fpath string, depth int) (*dag.Node, error) {
 		}
 	}
 
+	fmt.Printf("Adding dir: %s = %s\n", fpath)
 	return tree, addNode(n, tree, fpath)
 }
 
diff --git a/core/core.go b/core/core.go
index 005b6e62135760c58190ff32410c5b4151323e1d..f29f87abcdd03390bf448491e32302da35ca098e 100644
--- a/core/core.go
+++ b/core/core.go
@@ -238,3 +238,5 @@ func (n *IpfsNode) PinDagNode(nd *merkledag.Node) error {
 	u.DOut("Pinning node. Currently No-Op\n")
 	return nil
 }
+
+func (n *IpfsNode) SetIpnsEntry() {}
diff --git a/routing/dht/routing.go b/routing/dht/routing.go
index 16f74380b122f0ef102ba7c46d16addc14c25c57..3d7a4bf0a762159d60c0fda9fb2a7c3b3e7c6717 100644
--- a/routing/dht/routing.go
+++ b/routing/dht/routing.go
@@ -152,15 +152,14 @@ func (dht *IpfsDHT) FindProvidersAsync2(ctx context.Context, key u.Key, count in
 
 		peers := dht.routingTables[0].NearestPeers(kb.ConvertKey(key), AlphaValue)
 		for _, pp := range peers {
-			ppp := pp
-			go func() {
-				pmes, err := dht.findProvidersSingle(ctx, ppp, key, 0)
+			go func(p *peer.Peer) {
+				pmes, err := dht.findProvidersSingle(p, key, 0, timeout)
 				if err != nil {
 					u.PErr("%v\n", err)
 					return
 				}
-				dht.addPeerListAsync(key, pmes.GetProviderPeers(), ps, count, peerOut)
-			}()
+				dht.addPeerListAsync(key, pmes.GetPeers(), ps, count, peerOut)
+			}(pp)
 		}
 
 	}()