Firewall rule fixes