fix - missing self refs in class methods.

Change-Id: I5e6bd9b251dd69f66d68f49aba41effc73c6c05a