Fixes to SSH problems