A few improvements to handling of ssh keys.