Fix msg-id references.