diff --git a/app/app.go b/app/app.go
index ea374649..21f2f52c 100644
--- a/app/app.go
+++ b/app/app.go
@@ -89,7 +89,7 @@ func (app *App) VersionName() string {
 	if app.versionName != "" {
 		return app.versionName
 	}
-	return AppName + ":" + GitSummary + "/any-sync:" + app.anySyncVersion
+	return AppName + ":" + GitSummary + "/any-sync:" + app.AnySyncVersion()
 }
 
 type Stat struct {
diff --git a/net/transport/yamux/conn.go b/net/transport/yamux/conn.go
index c752d22d..0013f2bb 100644
--- a/net/transport/yamux/conn.go
+++ b/net/transport/yamux/conn.go
@@ -3,6 +3,7 @@ package yamux
 import (
 	"context"
 	"github.com/anyproto/any-sync/net/connutil"
+	"github.com/anyproto/any-sync/net/peer"
 	"github.com/anyproto/any-sync/net/transport"
 	"github.com/hashicorp/yamux"
 	"net"
@@ -10,6 +11,7 @@ import (
 )
 
 func NewMultiConn(cctx context.Context, luConn *connutil.LastUsageConn, addr string, sess *yamux.Session) transport.MultiConn {
+	cctx = peer.CtxWithPeerAddr(cctx, sess.RemoteAddr().String())
 	return &yamuxConn{
 		ctx:     cctx,
 		luConn:  luConn,