gpg fixes