Fix up attributes