Fixes to adding lots of attachments