Fix issues with ssh auth wrapper