Fix for firewall issues