Fix for network/network-uri split, fix examples