Fix proxy support, remove typecasts.

3 files changed