diff --git a/app/app.go b/app/app.go
index 2107dc17e..27a3b9c98 100644
--- a/app/app.go
+++ b/app/app.go
@@ -150,7 +150,7 @@ func (app *Basecoin) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQu
 	// handle special path for account info
 	if reqQuery.Path == "/account" {
 		reqQuery.Path = "/key"
-		reqQuery.Data = sm.AccountKey(reqQuery.Data)
+		reqQuery.Data = types.AccountKey(reqQuery.Data)
 	}
 
 	resQuery, err := app.eyesCli.QuerySync(reqQuery)
diff --git a/cmd/basecli/commands/adapters.go b/cmd/basecli/commands/adapters.go
index a1899019c..fa2cfec08 100644
--- a/cmd/basecli/commands/adapters.go
+++ b/cmd/basecli/commands/adapters.go
@@ -23,7 +23,7 @@ type AccountPresenter struct{}
 func (_ AccountPresenter) MakeKey(str string) ([]byte, error) {
 	res, err := hex.DecodeString(str)
 	if err == nil {
-		res = state.AccountKey(res)
+		res = btypes.AccountKey(res)
 	}
 	return res, err
 }
diff --git a/cmd/commands/ibc.go b/cmd/commands/ibc.go
index fa6d4758c..4297bba42 100644
--- a/cmd/commands/ibc.go
+++ b/cmd/commands/ibc.go
@@ -196,13 +196,18 @@ func ibcPacketCreateTxCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	var payload ibc.Payload
+	if err := wire.ReadBinaryBytes(payloadBytes, &payload); err != nil {
+		return err
+	}
+
 	ibcTx := ibc.IBCPacketCreateTx{
 		Packet: ibc.Packet{
 			SrcChainID: fromChain,
 			DstChainID: toChain,
 			Sequence:   sequence,
 			Type:       packetType,
-			Payload:    payloadBytes,
+			Payload:    payload,
 		},
 	}
 
diff --git a/cmd/commands/utils.go b/cmd/commands/utils.go
index ae1f49aaa..ff14faf45 100644
--- a/cmd/commands/utils.go
+++ b/cmd/commands/utils.go
@@ -11,7 +11,6 @@ import (
 	abci "github.com/tendermint/abci/types"
 	wire "github.com/tendermint/go-wire"
 
-	"github.com/tendermint/basecoin/state"
 	"github.com/tendermint/basecoin/types"
 
 	client "github.com/tendermint/tendermint/rpc/client"
@@ -114,7 +113,7 @@ func Query(tmAddr string, key []byte) (*abci.ResultQuery, error) {
 // fetch the account by querying the app
 func getAcc(tmAddr string, address []byte) (*types.Account, error) {
 
-	key := state.AccountKey(address)
+	key := types.AccountKey(address)
 	response, err := Query(tmAddr, key)
 	if err != nil {
 		return nil, err