Further Attachment Fixes