- Add bogus email address to generated public key
- Fix issue with really long public keys containing embedded subkey data