Update payment risk assessment, and fix broken specs. Fixes #4630