Fixed other network code (soon...)