fixes related to non-debug and firewalls