Minor tweaks for downloading attachments