Added missing self. prefixes