Make firewall more robust