Fix broken firewall scripts and rspecs