Merge back the network fixes