More GC fixes.