Fixes Sonar Issues.