More firewall fix