More updates for GC to GH change