batching fixes