Some batching fixes