Small additions and fixups to ssh