FIxes for non-ssh protocols