Minor changes to networking