fixed some more self-references