Re-add network fixes