Fix attributes issues