Fix tunnel attr handling