fix two issues w/ Mass Pay