Fix auto completion for SSH hosts when saved with a non-standard port
Fixup GPG agent ssh support