Fixed proxy setup code