fixes for a couple of payment bugs