Potential fix for payments. + Misc