Network fixes