Bunch of NetworkSet fixes