Sonar and CLM fixes