Fix gpg-agent and DiffOrig