Hacking fixes to attachments without metadata.