More GC fixes