More batch payment fixes