Fix references to object attributes