diff --git a/vault/policy.go b/vault/policy.go
index 3368c45ba1..7866dd25c5 100644
--- a/vault/policy.go
+++ b/vault/policy.go
@@ -66,7 +66,6 @@ func (p *PathPolicy) TakesPrecedence(other *PathPolicy) bool {
 	default:
 		panic("missing case")
 	}
-	return false
 }
 
 // Parse is used to parse the specified ACL rules into an
diff --git a/vault/policy_store_test.go b/vault/policy_store_test.go
index b9ec3268dd..4e4b8fe0f9 100644
--- a/vault/policy_store_test.go
+++ b/vault/policy_store_test.go
@@ -136,7 +136,7 @@ func TestPolicyStore_v1Upgrade(t *testing.T) {
 
 	// Put a V1 record
 	raw := `path "foo" { policy = "read" }`
-	ps.view.Put(&logical.StorageEntry{"old", []byte(raw)})
+	ps.view.Put(&logical.StorageEntry{Key: "old", Value: []byte(raw)})
 
 	// Do a read
 	p, err := ps.GetPolicy("old")