Fix up dynamic batch sizes