Fix for sonar critical issues.