Move firewall stuff out of overstate