some fixes
Attributes.Assign optimization