more stuff to deal with proxy issues