Fixing sonar errors.