some minor sonar fixes.