Fixed more bugs in network