Add a few more references to self