Fix for Sonar issues