Enhancements for HttpTunnel