Some fixes in proxy feature