NXP-14625: fix some proxy-related stuff