More sonar issues