GC safety fixes