- Fixed two GC bugs