Fix attributes