fix some self references