attachments patch fixes