Networking/Garbage collection fix