Batch fixes. 1 test failure.