Fix newly introduced Sonar remarks