fixes for accepting user generated payment types