Better port mapping fallback
Proxy enhancements