Fix the sonar issue and clm issue