Fix issues on keypair and message on next step