Batching fixes