diff --git a/cmd/rest/client.go b/cmd/rest/client.go
index 36e3a07e1..79629d442 100644
--- a/cmd/rest/client.go
+++ b/cmd/rest/client.go
@@ -60,6 +60,8 @@ func (n *NetworkError) Unwrap() error {
 
 // Client - http based RPC client.
 type Client struct {
+	connected int32 // ref: https://golang.org/pkg/sync/atomic/#pkg-note-BUG
+
 	// HealthCheckFn is the function set to test for health.
 	// If not set the client will not keep track of health.
 	// Calling this returns true or false if the target
@@ -84,7 +86,6 @@ type Client struct {
 	httpClient   *http.Client
 	url          *url.URL
 	newAuthToken func(audience string) string
-	connected    int32
 }
 
 // URL query separator constants
diff --git a/pkg/sync/errgroup/errgroup.go b/pkg/sync/errgroup/errgroup.go
index 74fbabc53..5950e3464 100644
--- a/pkg/sync/errgroup/errgroup.go
+++ b/pkg/sync/errgroup/errgroup.go
@@ -27,10 +27,10 @@ import (
 //
 // A zero Group can be used if errors should not be tracked.
 type Group struct {
+	firstErr  int64 // ref: https://golang.org/pkg/sync/atomic/#pkg-note-BUG
 	wg        sync.WaitGroup
 	bucket    chan struct{}
 	errs      []error
-	firstErr  int64
 	cancel    context.CancelFunc
 	ctxCancel <-chan struct{} // nil if no context.
 	ctxErr    func() error