fix minor Sonar issues