AttributeCollection fixes