AttachmentLoader fixes