Payment tweaks

Two small tweaks to the payment / order processing code.