diff --git a/internal/transport/handler_server.go b/internal/transport/handler_server.go
index c3c32daf..228b8218 100644
--- a/internal/transport/handler_server.go
+++ b/internal/transport/handler_server.go
@@ -338,7 +338,7 @@ func (ht *serverHandlerTransport) HandleStreams(startStream func(*Stream), trace
 		Addr: ht.RemoteAddr(),
 	}
 	if req.TLS != nil {
-		pr.AuthInfo = credentials.TLSInfo{State: *req.TLS, CommonAuthInfo: credentials.CommonAuthInfo{credentials.PrivacyAndIntegrity}}
+		pr.AuthInfo = credentials.TLSInfo{State: *req.TLS, CommonAuthInfo: credentials.CommonAuthInfo{SecurityLevel: credentials.PrivacyAndIntegrity}}
 	}
 	ctx = metadata.NewIncomingContext(ctx, ht.headerMD)
 	s.ctx = peer.NewContext(ctx, pr)
diff --git a/internal/wrr/edf.go b/internal/wrr/edf.go
index 2fca10b4..307ad2a7 100644
--- a/internal/wrr/edf.go
+++ b/internal/wrr/edf.go
@@ -61,7 +61,7 @@ func (pq *edfPriorityQueue) Pop() interface{} {
 }
 
 // Current time in EDF scheduler.
-func (edf edfWrr) currentTime() float64 {
+func (edf *edfWrr) currentTime() float64 {
 	if len(edf.items) == 0 {
 		return 0.0
 	}
diff --git a/profiling/cmd/remote.go b/profiling/cmd/remote.go
index 711468c0..930aec4f 100644
--- a/profiling/cmd/remote.go
+++ b/profiling/cmd/remote.go
@@ -73,7 +73,9 @@ func retrieveSnapshot(ctx context.Context, c ppb.ProfilingClient, f string) erro
 func remoteCommand() error {
 	ctx := context.Background()
 	if *flagTimeout > 0 {
-		ctx, _ = context.WithTimeout(context.Background(), time.Duration(*flagTimeout)*time.Second)
+		var cancel func()
+		ctx, cancel = context.WithTimeout(context.Background(), time.Duration(*flagTimeout)*time.Second)
+		defer cancel()
 	}
 
 	grpclog.Infof("dialing %s", *flagAddress)
diff --git a/xds/internal/balancer/edsbalancer/balancergroup.go b/xds/internal/balancer/edsbalancer/balancergroup.go
index fc10f3d3..ec652a68 100644
--- a/xds/internal/balancer/edsbalancer/balancergroup.go
+++ b/xds/internal/balancer/edsbalancer/balancergroup.go
@@ -557,9 +557,9 @@ func buildPickerAndState(m map[internal.Locality]*pickerState) balancer.State {
 		aggregatedState = connectivity.TransientFailure
 	}
 	if aggregatedState == connectivity.TransientFailure {
-		return balancer.State{aggregatedState, base.NewErrPickerV2(balancer.ErrTransientFailure)}
+		return balancer.State{ConnectivityState: aggregatedState, Picker: base.NewErrPickerV2(balancer.ErrTransientFailure)}
 	}
-	return balancer.State{aggregatedState, newPickerGroup(readyPickerWithWeights)}
+	return balancer.State{ConnectivityState: aggregatedState, Picker: newPickerGroup(readyPickerWithWeights)}
 }
 
 // RandomWRR constructor, to be modified in tests.