#1038 Tweaks to proxy tracking