Fix up attributes.