Sonar warnings

Change-Id: I9065dc14c5cbf0b6206df466c554dcbe0cd7f609