minor sonar fixes.