Fix proxy support