Fix pgp problems