Fixing sonar issues.