Bugfixes from mugwort-rc in OpenPGP