1. Fix the proxy connect bugs