more http tunnel fixes