Some tokenizer improvements