SSH support fixes