diff --git a/cmd/swarm/flags.go b/cmd/swarm/flags.go
index 9d3b8c8553..5e1ada6329 100644
--- a/cmd/swarm/flags.go
+++ b/cmd/swarm/flags.go
@@ -150,7 +150,7 @@ var (
 	SwarmStoreCacheCapacity = cli.UintFlag{
 		Name:   "store.cache.size",
 		Usage:  "Number of recent chunks cached in memory",
-		EnvVar: SWARM_ENV_STORE_CACHE_CAPACITY,
+		EnvVar: SwarmEnvStoreCacheCapacity,
 		Value:  10000,
 	}
 	SwarmCompressedFlag = cli.BoolFlag{
diff --git a/cmd/swarm/swarm-smoke/sliding_window.go b/cmd/swarm/swarm-smoke/sliding_window.go
index 4e71a6a126..02ded46817 100644
--- a/cmd/swarm/swarm-smoke/sliding_window.go
+++ b/cmd/swarm/swarm-smoke/sliding_window.go
@@ -101,8 +101,8 @@ outer:
 				case q <- struct{}{}:
 					go func() {
 						var start time.Time
-					inner:
-						for {
+						done := false
+						for !done {
 							log.Info("trying to retrieve hash", "hash", v.hash)
 							idx := 1 + rand.Intn(len(hosts)-1)
 							ruid := uuid.New()[:8]
@@ -111,9 +111,10 @@ outer:
 							// catch the timeout, but also allow this retry logic
 							err := fetch(v.hash, httpEndpoint(hosts[idx]), v.digest, ruid, "")
 							if err != nil {
-								continue inner
+								log.Error("error fetching hash", "err", err)
+								continue
 							}
-							break inner
+							done = true
 						}
 						metrics.GetOrRegisterResettingTimer("sliding-window.single.fetch-time", nil).UpdateSince(start)
 						d <- struct{}{}
@@ -123,7 +124,7 @@ outer:
 					break task
 				case <-timeoutC:
 					errored = true
-					log.Error("error retrieving hash. timeout", "hash idx", i, "err", err)
+					log.Error("error retrieving hash. timeout", "hash idx", i)
 					metrics.GetOrRegisterCounter("sliding-window.single.error", nil).Inc(1)
 					break outer
 				default: