GC update/fix from GCCP