SSH fixes from giox069-gtk3