Registration payment fixes