Fix sonars from dependency upgrade