More fixes to the payout system