Fixes in tokenizer