Fixed some Sonar warnings