improved firewall support