diff --git a/cmd/vpcagent/main.go b/cmd/vpcagent/main.go
index c2083f4b65..ca94c05a0b 100644
--- a/cmd/vpcagent/main.go
+++ b/cmd/vpcagent/main.go
@@ -23,6 +23,7 @@ import (
 
 	"yunion.io/x/log"
 
+	"yunion.io/x/onecloud/pkg/appctx"
 	app_common "yunion.io/x/onecloud/pkg/cloudcommon/app"
 	common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
 	"yunion.io/x/onecloud/pkg/util/atexit"
@@ -60,6 +61,7 @@ func main() {
 
 		wg := &sync.WaitGroup{}
 		ctx = context.WithValue(ctx, "wg", wg)
+		ctx = context.WithValue(ctx, appctx.APP_CONTEXT_KEY_APPNAME, "vpcagent")
 		wg.Add(1)
 		go w.Start(ctx)
 
diff --git a/pkg/apihelper/reflect.go b/pkg/apihelper/reflect.go
index 8d49d73b14..594abaad00 100644
--- a/pkg/apihelper/reflect.go
+++ b/pkg/apihelper/reflect.go
@@ -102,6 +102,7 @@ func GetModels(opts *GetModelsOptions) error {
 	}
 
 	listOptions := options.BaseListOptions{
+		System:       options.Bool(true),
 		Admin:        options.Bool(true),
 		Details:      options.Bool(opts.IncludeDetails),
 		ShowEmulated: options.Bool(opts.IncludeEmulated),
diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go
index ff92549b0e..c1ddd05289 100644
--- a/pkg/appsrv/appsrv.go
+++ b/pkg/appsrv/appsrv.go
@@ -236,7 +236,14 @@ func (app *Application) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		skipLog = true
 	}
 	if !skipLog {
-		log.Infof("%s %d %s %s %s (%s) %.2fms", app.hostId, lrw.status, rid, r.Method, r.URL, r.RemoteAddr, duration)
+		peerServiceName := r.Header.Get("X-Yunion-Peer-Service-Name")
+		var remote string
+		if len(peerServiceName) > 0 {
+			remote = fmt.Sprintf("%s:%s", r.RemoteAddr, peerServiceName)
+		} else {
+			remote = r.RemoteAddr
+		}
+		log.Infof("%s %d %s %s %s (%s) %.2fms", app.hostId, lrw.status, rid, r.Method, r.URL, remote, duration)
 	}
 }
 
diff --git a/pkg/mcclient/modules/compute/mod_servernetworks.go b/pkg/mcclient/modules/compute/mod_servernetworks.go
index 9128f13f1d..6016476ba4 100644
--- a/pkg/mcclient/modules/compute/mod_servernetworks.go
+++ b/pkg/mcclient/modules/compute/mod_servernetworks.go
@@ -28,7 +28,7 @@ func init() {
 		"guestnetwork",
 		"guestnetworks",
 		[]string{"Guest_ID", "Guest",
-			"Network_ID", "Network", "Mac_addr",
+			"Network_ID", "Network", "Mac_addr", "Mapped_Ip_Addr",
 			"IP_addr", "Driver", "BW_limit", "Index",
 			"Virtual", "Ifname", "team_with"},
 		[]string{},
diff --git a/pkg/mcclient/options/compute/servers.go b/pkg/mcclient/options/compute/servers.go
index 6af9b9b664..f9fb5d3cae 100644
--- a/pkg/mcclient/options/compute/servers.go
+++ b/pkg/mcclient/options/compute/servers.go
@@ -541,6 +541,8 @@ func (opts *ServerCreateOptionalOptions) OptionalParams() (*computeapi.ServerCre
 	// set description
 	params.Description = opts.Desc
 
+	params.IsSystem = &opts.System
+
 	return params, nil
 }
 
diff --git a/pkg/util/httputils/httputils.go b/pkg/util/httputils/httputils.go
index cfd89a52c9..0ad0830dbd 100644
--- a/pkg/util/httputils/httputils.go
+++ b/pkg/util/httputils/httputils.go
@@ -494,14 +494,18 @@ func requestInternal(client sClient, ctx context.Context, method THttpMethod, ur
 	}
 	ctxData := appctx.FetchAppContextData(ctx)
 	var clientTrace *trace.STrace
-	if !ctxData.Trace.IsZero() {
+	if len(ctxData.ServiceName) > 0 {
+		if !ctxData.Trace.IsZero() {
+			clientTrace = &ctxData.Trace
+		}
 		addr, port, err := GetAddrPort(urlStr)
 		if err != nil {
 			return nil, nil, err
 		}
-		clientTrace = trace.StartClientTrace(&ctxData.Trace, addr, port, ctxData.ServiceName)
+		clientTrace = trace.StartClientTrace(clientTrace, addr, port, ctxData.ServiceName)
 		clientTrace.AddClientRequestHeader(header)
 	}
+
 	if len(ctxData.RequestId) > 0 {
 		header.Set("X-Request-Id", ctxData.RequestId)
 	}