diff --git a/state/execution.go b/state/execution.go
index 370fa0954..9ffd2be71 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -258,7 +258,7 @@ func getBeginBlockValidatorInfo(block *types.Block, lastValSet *types.ValidatorS
 		// `SetValidatorSet()` and `ToABCI` methods ?
 		valset, err := LoadValidators(stateDB, ev.Height())
 		if err != nil {
-			panic(err) // shoudn't happen
+			panic(err) // shouldn't happen
 		}
 		byzVals[i] = types.TM2PB.Evidence(ev, valset, block.Time)
 	}
diff --git a/types/protobuf.go b/types/protobuf.go
index dd9d8bb66..00e36215b 100644
--- a/types/protobuf.go
+++ b/types/protobuf.go
@@ -52,12 +52,12 @@ func (tm2pb) PubKey(pubKey crypto.PubKey) abci.PubKey {
 	switch pk := pubKey.(type) {
 	case crypto.PubKeyEd25519:
 		return abci.PubKey{
-			Type: "ed25519",
+			Type: ABCIPubKeyTypeEd25519,
 			Data: pk[:],
 		}
 	case crypto.PubKeySecp256k1:
 		return abci.PubKey{
-			Type: "secp256k1",
+			Type: ABCIPubKeyTypeSecp256k1,
 			Data: pk[:],
 		}
 	default: