InstantSSH: Several fixes