Fix the sonar issue and clm issue

No match.