diff --git a/cmd/mesh-bootstrap/main.go b/cmd/mesh-bootstrap/main.go
index 5f2a9c0d5..34680defc 100644
--- a/cmd/mesh-bootstrap/main.go
+++ b/cmd/mesh-bootstrap/main.go
@@ -27,6 +27,7 @@ import (
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	dhtopts "github.com/libp2p/go-libp2p-kad-dht/opts"
 	"github.com/libp2p/go-libp2p-peerstore/pstoreds"
+	"github.com/libp2p/go-libp2p-secio"
 	"github.com/libp2p/go-libp2p/p2p/host/relay"
 	filter "github.com/libp2p/go-maddr-filter"
 	ma "github.com/multiformats/go-multiaddr"
@@ -124,7 +125,7 @@ func main() {
 		if err != nil {
 			return nil, err
 		}
-		kadDHT, err = dht.New(ctx, h, dhtopts.Datastore(store), dht.V1ProtocolOverride(p2p.DHTProtocolID))
+		kadDHT, err = dht.New(ctx, h, dhtopts.Datastore(store), dht.V1ProtocolOverride(p2p.DHTProtocolID), dht.Mode(dht.ModeServer))
 		if err != nil {
 			log.WithField("error", err).Fatal("could not create DHT")
 		}
@@ -168,6 +169,7 @@ func main() {
 		libp2p.BandwidthReporter(bandwidthCounter),
 		libp2p.Peerstore(peerStore),
 		libp2p.Filters(filters),
+		libp2p.Security(secio.ID, secio.New),
 	}
 
 	if config.EnableRelayHost {
@@ -184,7 +186,6 @@ func main() {
 	basicHost.Network().Notify(&notifee{})
 
 	// Enable AutoNAT service.
-	// FIXME - Should this be force enabled?
 	if _, err := autonat.NewAutoNATService(ctx, basicHost, true); err != nil {
 		log.WithField("error", err).Fatal("could not enable AutoNAT service")
 	}
diff --git a/p2p/opts.go b/p2p/opts.go
index 2882a53f0..03ee6067b 100644
--- a/p2p/opts.go
+++ b/p2p/opts.go
@@ -115,5 +115,5 @@ func getPublicIP() (string, error) {
 // in native (pure Go) environments. Standalone nodes use a SQL key value store
 // to persist data and browser nodes use a Dexie key value store.
 func NewDHT(ctx context.Context, db *db.DB, host host.Host) (*dht.IpfsDHT, error) {
-	return dht.New(ctx, host, dhtopts.Datastore(db.DHTStore()), dht.V1ProtocolOverride(DHTProtocolID), dht.Mode(dht.ModeServer))
+	return dht.New(ctx, host, dhtopts.Datastore(db.DHTStore()), dht.V1ProtocolOverride(DHTProtocolID), dht.Mode(dht.ModeAutoServer))
 }