Minor tweaks to facilitate mail source debugging