Fix sonar minor issues