batch_stats more fixes