More changes to handle new networking code