Some changes to gnupg.