Attribute+metadata fixes