Working around more GC allocation issues