Minor fixes reported by sonar
Sonar fixes