Fixes for proxy config