Fixes for GC weirdness.