Payments last tweaks