Some payment fixes