Ask for symmetric passphrase twice, other cosmetic fixes