Improve gpg-agent support