Fixes for network-list