String::Tokenize() fixes