Fix network and templates