diff --git a/nameserver/entry.go b/nameserver/entry.go
index 5c0329e8..d1c8f830 100644
--- a/nameserver/entry.go
+++ b/nameserver/entry.go
@@ -131,7 +131,7 @@ func (es *Entries) merge(incoming Entries) Entries {
 	return newEntries
 }
 
-func (es *Entries) tombstone(ourname router.PeerName, f func(*Entry) bool) *Entries {
+func (es *Entries) tombstone(ourname router.PeerName, f func(*Entry) bool) Entries {
 	es.checkAndPanic()
 	defer es.checkAndPanic()
 	tombstoned := Entries{}
@@ -143,7 +143,7 @@ func (es *Entries) tombstone(ourname router.PeerName, f func(*Entry) bool) *Entr
 			tombstoned = append(tombstoned, e)
 		}
 	}
-	return &tombstoned
+	return tombstoned
 }
 
 func (es *Entries) filter(f func(*Entry) bool) {
diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go
index 4c6c05a0..be4c4987 100644
--- a/nameserver/nameserver.go
+++ b/nameserver/nameserver.go
@@ -130,8 +130,8 @@ func (n *Nameserver) ContainerDied(ident string) {
 		return false
 	})
 	n.Unlock()
-	if n.gossip != nil && len(*entries) > 0 {
-		err := n.gossip.GossipBroadcast(entries)
+	if n.gossip != nil && len(entries) > 0 {
+		err := n.gossip.GossipBroadcast(&entries)
 		if err != nil {
 			n.errorf("Failed to broadcast container '%s' death: %v", ident, err)
 		}
@@ -166,7 +166,7 @@ func (n *Nameserver) Delete(hostname, containerid, ipStr string, ip address.Addr
 	})
 	n.Unlock()
 	if n.gossip != nil {
-		return n.gossip.GossipBroadcast(entries)
+		return n.gossip.GossipBroadcast(&entries)
 	}
 	return nil
 }