Payment info fixes