fixes to firewall