Textual self-references fixed