Add fixes to make ssh-action work with a different instance

Add fixes to make ssh-action work with a different instance #500