Network component fixes