Change a few ssh related issues