Oops...  fixing some old "self" references