A variety of GC fixes