Some fixes to render batches (I guess)