Small fixes to tunnels and cypto

Also update the comment here to explain why we comment this ```if```.