fixed a few Sonarqube issues

Change-Id: I3e2317e992fcc11bc071f605a597184c7de19eca
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
3 files changed