More SSH Fixes