BF: Correct the missing attributes for state references.