fixes to handling of aborted card and direct bank payments