Better tunnel handling.