Fixed several proxy issues