Fix the build post merge
Some more minor network cleanup