Fix several payment specs.