small GC handling tweaks #12701