Changes for proxy to run with multiple descriptors, cleanup