Fixes for payment identifier => number.