Add firewall nodes.  Fix h2