Small fixes to tunnels and cypto