Fixed more GC bugs