diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go
index b23d452869..c2209a3204 100644
--- a/cmd/swarm/config.go
+++ b/cmd/swarm/config.go
@@ -225,15 +225,15 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con
 	}
 
 	if storeCapacity := ctx.GlobalUint64(SwarmStoreCapacity.Name); storeCapacity != 0 {
-		currentConfig.StoreParams.DbCapacity = uint64(storeCapacity)
+		currentConfig.StoreParams.DbCapacity = storeCapacity
 	}
 
 	if storeCacheCapacity := ctx.GlobalUint(SwarmStoreCacheCapacity.Name); storeCacheCapacity != 0 {
-		currentConfig.StoreParams.CacheCapacity = uint(storeCacheCapacity)
+		currentConfig.StoreParams.CacheCapacity = storeCacheCapacity
 	}
 
 	if storeRadius := ctx.GlobalInt(SwarmStoreRadius.Name); storeRadius != 0 {
-		currentConfig.StoreParams.Radius = int(storeRadius)
+		currentConfig.StoreParams.Radius = storeRadius
 	}
 
 	return currentConfig
diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go
index 2855e2f298..782faaf35c 100644
--- a/swarm/storage/mock/db/db_test.go
+++ b/swarm/storage/mock/db/db_test.go
@@ -1,3 +1,5 @@
+// +build go1.8
+//
 // Copyright 2018 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //