Upgrade StringUtils