Ensure gateway_payment_profile_id is being set correctly