Minor firewall fixes