Better Tokenizer Fix 02

More fixes.