Fixes to Network templates