Assignments & Attachments fixes