Small changes to tunnels