Some SSH slowness fixes