fixes to networking infrastructure