Minimal further GC improvements