Minor tweaks to GC