Small fixes in proxy code.