Fixed references to StringUtil