SMF: Attachment corrections