Fix some constants.
Small constants cleanup.
Add import for attribute.