Correct invalid self references