Cumulative fixes for HttpTunnel, PortMapping and messages