And fix some auras and equipements (cherry picked from commit c478d0cc7ce308443a267c2fd575c6d86734e574)