Fix NPE due to batches not being model-specific