Bugfixes

Disable tunneling #3296, by @nielsvanvelzen