Fix attributes for global registry