Fixes for proxy

Got it!