#20 Several GC oriented tweaks.