Fix references to attributes.