Firewall fixes -  develop

This is a companion pull request for #51 -- rebased against develop.