Fixing critical issues with Fees > Batch Payments (#2656)