merge fixes as per comments in merge

https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753