gpg fixes
gpg fixes