More fixes for remote_party_id