Attribute ref fixes