Cleanups. FillPaymentDetails fixes.