Add fixes for proxy