Merge "Fix minor sonar issues"