Correcting issues shown on Sonar