Adding more payment profile fixes