GPG fixes