diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go
index 67e852dde5aa7a0fb71b42bc96300837d24e98ab..dd2d513c24b348d548cf01efc02bb83bd7cac516 100644
--- a/cmd/swarm/access.go
+++ b/cmd/swarm/access.go
@@ -130,7 +130,7 @@ func accessNewACT(ctx *cli.Context) {
 		if err != nil {
 			utils.Fatalf("had an error reading the grantee public key list")
 		}
-		pkGrantees = strings.Split(string(bytes), "\n")
+		pkGrantees = strings.Split(strings.Trim(string(bytes), "\n"), "\n")
 	}
 
 	if passGranteesFilename != "" {
@@ -138,7 +138,7 @@ func accessNewACT(ctx *cli.Context) {
 		if err != nil {
 			utils.Fatalf("could not read password filename: %v", err)
 		}
-		passGrantees = strings.Split(string(bytes), "\n")
+		passGrantees = strings.Split(strings.Trim(string(bytes), "\n"), "\n")
 	}
 	accessKey, ae, actManifest, err = api.DoACT(ctx, privateKey, salt, pkGrantees, passGrantees)
 	if err != nil {
diff --git a/swarm/storage/mru/lookup/epoch_test.go b/swarm/storage/mru/lookup/epoch_test.go
index 8c63ec6c2f3e0f37a9b45e053397619df0f800ad..62cf5523d8066a53e0c904a6e851e19846106ac0 100644
--- a/swarm/storage/mru/lookup/epoch_test.go
+++ b/swarm/storage/mru/lookup/epoch_test.go
@@ -42,15 +42,15 @@ func TestAfter(t *testing.T) {
 		Level: 4,
 	}
 
-	if b.After(a) != true {
+	if !b.After(a) {
 		t.Fatal("Expected 'after' to be true, got false")
 	}
 
-	if b.After(b) != false {
+	if b.After(b) {
 		t.Fatal("Expected 'after' to be false when both epochs are identical, got true")
 	}
 
-	if b.After(c) != true {
+	if !b.After(c) {
 		t.Fatal("Expected 'after' to be true when both epochs have the same time but the level is lower in the first one, but got false")
 	}
 
diff --git a/swarm/storage/mru/lookup/lookup_test.go b/swarm/storage/mru/lookup/lookup_test.go
index ca0bb73bbebd47d16ad6d7f0400db92014215654..34bcb61f0c5d8d2a45664acc31798defecffcf4e 100644
--- a/swarm/storage/mru/lookup/lookup_test.go
+++ b/swarm/storage/mru/lookup/lookup_test.go
@@ -38,9 +38,7 @@ func write(store Store, epoch lookup.Epoch, value *Data) {
 }
 
 func update(store Store, last lookup.Epoch, now uint64, value *Data) lookup.Epoch {
-	var epoch lookup.Epoch
-
-	epoch = lookup.GetNextEpoch(last, now)
+	epoch := lookup.GetNextEpoch(last, now)
 
 	write(store, epoch, value)
 
diff --git a/swarm/storage/mru/query.go b/swarm/storage/mru/query.go
index 9a0f261c40954367836cb2c1c2ddb371d4693fd1..13a28eaaba4ed2e6a53cc5cdb8cc2e8952238df8 100644
--- a/swarm/storage/mru/query.go
+++ b/swarm/storage/mru/query.go
@@ -36,7 +36,7 @@ type Query struct {
 // useful to parse query strings
 func (q *Query) FromValues(values Values) error {
 	time, _ := strconv.ParseUint(values.Get("time"), 10, 64)
-	q.TimeLimit = uint64(time)
+	q.TimeLimit = time
 
 	level, _ := strconv.ParseUint(values.Get("hint.level"), 10, 32)
 	q.Hint.Level = uint8(level)