Fix bad references to self