Fix up ssh support