Fixing proxy issues