Fix network tracing bugs