More firewall fixes