Fixes, cheers @ninjalulz
Merge pull request #1009 from Skillert/tunnelFix

Fixes, cheers @ninjalulz