Batch with misc fixes