Fix Attribute defs