Tunnel bugfixes