Some StringTools fixes