StringHelper sonar fixes