Fixe mino issues for sonar