Some fixes on multipayments feature